[readonly/geninitrd/devel: 216/334] Preffer /sbin/chroot over /usr/sbin/chroot.

draenog draenog at pld-linux.org
Sat Nov 2 19:29:41 CET 2013


commit befc35620f116e4c1ae5134343123297a44828d5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Jun 24 13:26:32 2004 +0000

    Preffer /sbin/chroot over /usr/sbin/chroot.
    
    svn-id: @4240

 geninitrd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/geninitrd b/geninitrd
index 11c34cf..32b74b6 100755
--- a/geninitrd
+++ b/geninitrd
@@ -1076,6 +1076,7 @@ EOF
 	chmod 755 "$MNTIMAGE/bin/setdhcp"
 	echo "cd /newroot" >> "$s"
 	echo "pivot_root . initrd" >> "$s"
+	echo "exec /sbin/chroot . /sbin/init -i < dev/console > dev/console 2>&1" >> "$s"
 	echo "exec /usr/sbin/chroot . /sbin/init -i < dev/console > dev/console 2>&1" >> "$s"
 fi
 
@@ -1118,7 +1119,8 @@ if is_yes "$uselvm" ; then
 		echo "umount /proc" >> "$s"
 	        echo "cd /newroot" >> "$s"
 	        echo "pivot_root . initrd" >> "$s"
-	        echo "exec /usr/sbin/chroot . /sbin/init -i < dev/console > dev/console 2>&1" >> "$s"
+	        echo "exec /sbin/chroot . /sbin/init -i < dev/console > dev/console 2>&1" >> "$s"
+		echo "exec /usr/sbin/chroot . /sbin/init -i < dev/console > dev/console 2>&1" >> "$s"
 	fi
 fi
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/398807324938659207036e520c0950a61ef50c11



More information about the pld-cvs-commit mailing list