Changeset 1092 in ProjectBuilder

Timestamp:

Sep 20, 2010, 4:51:02 PM (14 years ago)

Author:

Bruno Cornec

Message:

r4075@localhost: bruno | 2010-09-17 17:25:50 +0200

• Website now refers to correct man pages to start

Files:

• 0.9.10/pb/bin/pb (modified) (1 diff)
• 0.9.9/pb/bin/pb (modified) (1 diff)
• devel/website/docs.shtml (modified) (1 diff)

0.9.10/pb/bin/pb

@@ -1541 +1541 @@
         }
         my $hoption = "-p";
-        # Solaris doesn't support -h
-        $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)) {

0.9.9/pb/bin/pb

@@ -1541 +1541 @@
         }
         my $hoption = "-p";
-        # Solaris doesn't support -h
-        $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)) {

devel/website/docs.shtml

@@ -22 +22 @@
           <li>pb</li>
             <ul>
-                <li>A <a href="/docs/mondoarchive.8.html" target="_blank">HTML</a></li>
-                <li>A <a href="/docs/mondoarchive.8.pdf" target="_blank">PDF</a></li>
-                <li>A <a href="/docs/mondoarchive.8.ps" target="_blank">PostScript</a></li>
-                <li>A <a href="/docs/mondoarchive.8.txt" target="_blank">Text</a></li>
+                <li>A <a href="/docs/pb.1.html" target="_blank">HTML</a></li>
+                <li>A <a href="/docs/pb.1.pdf" target="_blank">PDF</a></li>
+                <li>A <a href="/docs/pb.1.ps" target="_blank">PostScript</a></li>
+                <li>A <a href="/docs/pb.1.txt" target="_blank">Text</a></li>
             </ul>
           <li>rpmbootstrap</li>
             <ul>
-                <li>A <a href="/docs/mondorestore.8.html" target="_blank">HTML</a></li>
-                <li>A <a href="/docs/mondorestore.8.pdf" target="_blank">PDF</a></li>
-                <li>A <a href="/docs/mondorestore.8.ps" target="_blank">PostScript</a></li>
-                <li>A <a href="/docs/mondorestore.8.txt" target="_blank">Text</a></li>
+                <li>A <a href="/docs/rpmbootstrap.1.html" target="_blank">HTML</a></li>
+                <li>A <a href="/docs/rpmbootstrap.1.pdf" target="_blank">PDF</a></li>
+                <li>A <a href="/docs/rpmbootstrap.1.ps" target="_blank">PostScript</a></li>
+                <li>A <a href="/docs/rpmbootstrap.1.txt" target="_blank">Text</a></li>
             </ul>
   </ul>