Changeset 1958 in ProjectBuilder for devel/pb/bin

Timestamp:

Mar 31, 2015, 1:32:50 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update copyrights dates notices
• Change pb_parallel_launchv interface to have pbimage earlier in the params to fix newvm not working anymore

File:

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

devel/pb/bin/pb

@@ -5 +5 @@
 # $Id$
 #
-# Copyright B. Cornec 2007-2012
+# Copyright B. Cornec 2007-2015
 # Eric Anderson's changes are (c) Copyright 2012 Hewlett Packard
 # Provided under the GPL v2
@@ -899 +899 @@
     pb_build2v("vm","build");
 } elsif ($action =~ /^launchvm$/) {
-    pb_parallel_launchv(undef,"vm",undef,3);
+    pb_parallel_launchv(undef,"vm",undef,3,$pbimage);
 } elsif ($action =~ /^launchve$/) {
-    pb_parallel_launchv(undef,"ve",undef,3);
+    pb_parallel_launchv(undef,"ve",undef,3,$pbimage);
 } elsif ($action =~ /^script2vm$/) {
     die "action script2vm requires a -s script option" if (not defined $pbscript{'default'});
@@ -914 +914 @@
     pb_newver();
 } elsif ($action =~ /^newve$/) {
-    pb_parallel_launchv(undef,"ve",undef,0);
+    pb_parallel_launchv(undef,"ve",undef,0,$pbimage);
 } elsif ($action =~ /^newvm$/) {
-    pb_parallel_launchv(undef,"vm",undef,0);
+    pb_parallel_launchv(undef,"vm",undef,0,$pbimage);
     pb_log(0, "Please ensure that sshd is running in your VM by default\n");
     pb_log(0, "and that it allows remote root login (PermitRootLogin yes in /etc/ssh/sshd_config)\n");
@@ -2805 +2805 @@
 pb_log(2,"DEBUG: pb_script2v($vtype,$pbstep,$pbforce,$snapme)\n");
 pb_log(2,"DEBUG: pb_script2v(pbscript: ".Dumper($pbscript)."\n");
-pb_parallel_launchv($pbscript,$vtype,uc($vtype)."Script",$pbstep,$pbforce,$snapme,$pbsnap,$pbimage);
+pb_parallel_launchv($pbscript,$vtype,uc($vtype)."Script",$pbstep,$pbimage,$pbforce,$snapme,$pbsnap);
 }
 
@@ -2814 +2814 @@
 my $action = shift;         # It an action is defined then use send2target
 my $pbstep=shift;           # Which step are we in (0: create, 1: setup, 2: build 3: use)
+my $pbimage=shift;          # Which image to use to start the VM/VE
 my $pbforce=shift;          # Force stop of VM. Default not.
 my $snapme = shift;         # By default do not snap a VM/VE/RM
 my $usesnap = shift;        # By default study the usage of the snapshot feature of VM/VE/RM    
-my $pbimage=shift;          # Which image to use to start the VM/VE
 my $vm;
 my $all;
@@ -3295 +3295 @@
 # Gather all required files to send them to the VM/VE
 # and launch the build through pbscript
-pb_parallel_launchv(\%pbscript,$vtype,uc($vtype).$action,$pbstep,$pbforce,0,1,$pbimage);
+pb_parallel_launchv(\%pbscript,$vtype,uc($vtype).$action,$pbstep,$pbimage,$pbforce);
 }
 
@@ -3929 +3929 @@
 # Launch the VM/VE/RM
 pb_log(2,"DEBUG: before parallel launch, pbscript hash is:".Dumper(%pbscript)."\n");
-pb_parallel_launchv(\%pbscript,$vtype,uc($vtype)."Script".$sbx,$pbstep,$pbforce);
+pb_parallel_launchv(\%pbscript,$vtype,uc($vtype)."Script".$sbx,$pbstep,$pbimage,$pbforce,0,$pbsnap);
 
 return;