Changeset 1194 in ProjectBuilder

Timestamp:

Feb 16, 2011, 12:47:06 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix halt invokation which was broken (full path now)

File:

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

devel/pb/bin/pb

@@ -1994 +1994 @@
         my $hoption = "-p";
         my $hpath = pb_distro_get_param($pbos,pb_conf_get("oscmdpath-halt"));
-        # Solaris doesn't support -p and has halt elsewhere
+        # Solaris doesn't support -p of halt
         if ($pbos->{'type'} eq "pkg") {
             $hoption = "" ;
         }
-        pb_system("$shcmd \"sudo $hpath/halt $hoption \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
+        pb_system("$shcmd \"sudo $hpath $hoption \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {
@@ -2966 +2966 @@
     if ($vtype =~ /^vm/) {
         my $hpath = pb_distro_get_param($pbos,pb_conf_get("oscmdpath-halt"));
-        my @sudocmds = pb_get_sudocmds($pbos,$ntpline,"$hpath/halt");
+        my @sudocmds = pb_get_sudocmds($pbos,$ntpline,$hpath);
         print SCRIPT << "EOF";
 # This is needed in order to be able on VM to halt the machine from the $pbac->{$ENV{'PBPROJ'}} account at least