Changeset 1124 in ProjectBuilder

Timestamp:

Dec 12, 2010, 11:49:48 PM (13 years ago)

Author:

Bruno Cornec

Message:

i- Adds new potion -g to support non-graphical modes on the CLI and not only in conf files and env var - Fix #68

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -78 +78 @@
 =head1 SYNOPSIS
 
-pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-t os-ver-arch][-m os-ver-arch[,...]]][-i iso] <action> [<pkg1> ...]
-
-pb [--verbose][--help][--man][--quiet][--snapshot][--revision pbroot][--project project][[--script script --account account --port port][--target os-ver-arch][--machine os-ver-arch[,...]]][--iso iso] <action> [<pkg1> ...]
+pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-t os-ver-arch][-m os-ver-arch[,...]]][-g][-i iso] <action> [<pkg1> ...]
+
+pb [--verbose][--help][--man][--quiet][--snapshot][--revision pbroot][--project project][[--script script --account account --port port][--target os-ver-arch][--machine os-ver-arch[,...]]][--nographics][--iso iso] <action> [<pkg1> ...]
 
 =head1 OPTIONS
@@ -119 +119 @@
 
 Name of the script you want to execute on the related VMs or VEs.
+
+=item B<-g|--nographics>
+
+Do not launch VMs in graphical mode.
 
 =item B<-i|--iso iso_image>
@@ -418 +422 @@
         "machines|mock|m=s" => \$opts{'m'},
         "target|t=s" => \$opts{'t'},
+        "nographics|g" => \$opts{'g'},
         "port|P=i" => \$opts{'P'},
         "project|p=s" => \$opts{'p'},
@@ -1840 +1845 @@
         my $vmtype = $ptr->{$ENV{'PBPROJ'}};
         my $vmcmd = $ptr2->{$ENV{'PBPROJ'}};
+
+        if (defined $opts{'g'}) {
+            if (($vmtype eq "kvm") || ($vmtype eq "qemu")) {
+                $ENV{'PBVMOPT'} = "--nographics";
+            }
+        }
         if (not defined $ENV{'PBVMOPT'}) {
             $ENV{'PBVMOPT'} = "";