Changeset 641

Timestamp:

12/11/08 19:21:51 (4 years ago)

Author:

bruno

Message:

• Fix atype in pb for PBVMOPT restoration which was still not working

File:

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

devel/pb/bin/pb

@@ -1421 +1421 @@
                 $vmcmd = "$qemucmd32";
             }
-            $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
-            if ($create != 0) {
-                $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
-            }
-            $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
+        $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
+        if ($create != 0) {
+            $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
+        }
+        $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
         } elsif ($vmtype eq "xen") {
         } elsif ($vmtype eq "vmware") {
@@ -1432 +1432 @@
         }
         # Restore the ENV VAR Value
-        $ENV{'PBMOPT'} = $ENV{'PBOLDVMOPT'};
+        $ENV{'PBVMOPT'} = $ENV{'PBOLDVMOPT'};
 
         my ($tmpcmd,$void) = split(/ +/,$cmd);
@@ -1811 +1811 @@
 EOF
         if (defined $ntpline) {
-            print SCRIPT "if ( -x /usr/sbin/ntpdate ) {\n";
+            print SCRIPT "if ( -x \"/usr/sbin/ntpdate\" ) {\n";
             print SCRIPT "  system(\"$ntpline\")\n";
             print SCRIPT "} else {\n";