Changeset 767 in ProjectBuilder

Timestamp:

Apr 27, 2009, 11:27:45 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug in creation of monitoring channel for snapshot of qemu/kvm VMs

File:

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

devel/pb/bin/pb

@@ -1418 +1418 @@
     my $all;
 
-    pb_log(2,"DEBUG: pb_script2v($pbscript,$vtype,$pbforce)\n");
+    pb_log(2,"DEBUG: pb_script2v($pbscript,$vtype,$pbforce,".Dumper($vm1).",$snapme)\n");
     # Prepare the script to be executed on the VM
     # in $ENV{'PBDESTDIR'}/pbscript
@@ -1468 +1468 @@
     my $snapme = shift || 0;        # By default do not snap a VM/VE
 
-    pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create)\n");
+    pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create,$snapme)\n");
     die "No VM/VE defined, unable to launch" if (not defined $v);
     # Keep only the first VM in case many were given
@@ -1500 +1500 @@
         if ($create == 0) {
             if ((defined $vmsnap->{$v}) && ($vmsnap->{$v} =~ /true/i)) {
-                $ENV{'PBVMOPT'} .= " -snapshot";
+                $ENV{'PBVMOPT'} .= "-snapshot ";
             } elsif ((defined $vmsnap->{$ENV{'PBPROJ'}}) && ($vmsnap->{$ENV{'PBPROJ'}} =~ /true/i)) {
-                $ENV{'PBVMOPT'} .= " -snapshot";
+                $ENV{'PBVMOPT'} .= "-snapshot ";
             } elsif ($pbsnap eq 1) {
-                $ENV{'PBVMOPT'} .= " -snapshot";
-            }
-        } elsif ($snapme != 0) {
+                $ENV{'PBVMOPT'} .= "-snapshot ";
+            }
+        } 
+        if ($snapme != 0) {
             if (($vmtype eq "kvm") || ($vmtype eq "qemu")) {
                 # Configure the monitoring to automize the creation of the 'pb' snapshot