Changeset 1091 in ProjectBuilder

Timestamp:

Sep 16, 2010, 2:20:43 AM (14 years ago)

Author:

Bruno Cornec

Message:

r4067@localhost: bruno | 2010-09-16 02:00:43 +0200

• halt command is in another path on Solaris so adding a parameter to support this

File:

• devel/pb/bin/pb (modified) (1 diff)

devel/pb/bin/pb

@@ -1577 +1577 @@
         }
         my $hoption = "-p";
-        # Solaris doesn't support -p
-        $hoption = "" if ($dtype eq "pkg");
-        pb_system("$shcmd \"sudo /sbin/halt $hoption \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
+        my $hpath = "/sbin";
+        # Solaris doesn't support -h and has halt elsewhere
+        if ($dtype eq "pkg") {
+            $hoption = "" ;
+            $hpath = "/usr/sbin";
+        }
+        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)");
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {