Changeset 641 for devel/pb/bin/pb


Ignore:
Timestamp:
Dec 11, 2008, 7:21:51 PM (11 years ago)
Author:
Bruno Cornec
Message:
  • Fix atype in pb for PBVMOPT restoration which was still not working
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r639 r641  
    14211421                $vmcmd = "$qemucmd32";
    14221422            }
    1423             $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
    1424             if ($create != 0) {
    1425                 $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
    1426             }
    1427             $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
     1423        $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
     1424        if ($create != 0) {
     1425            $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
     1426        }
     1427        $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
    14281428        } elsif ($vmtype eq "xen") {
    14291429        } elsif ($vmtype eq "vmware") {
     
    14321432        }
    14331433        # Restore the ENV VAR Value
    1434         $ENV{'PBMOPT'} = $ENV{'PBOLDVMOPT'};
     1434        $ENV{'PBVMOPT'} = $ENV{'PBOLDVMOPT'};
    14351435
    14361436        my ($tmpcmd,$void) = split(/ +/,$cmd);
     
    18111811EOF
    18121812        if (defined $ntpline) {
    1813             print SCRIPT "if ( -x /usr/sbin/ntpdate ) {\n";
     1813            print SCRIPT "if ( -x \"/usr/sbin/ntpdate\" ) {\n";
    18141814            print SCRIPT "  system(\"$ntpline\")\n";
    18151815            print SCRIPT "} else {\n";
Note: See TracChangeset for help on using the changeset viewer.