|
|
@ -251,8 +251,11 @@ pivot_root . tmp/.initrd
|
|
|
|
# We cannot use if [ this = that ] after a pivot_root as
|
|
|
|
# We cannot use if [ this = that ] after a pivot_root as
|
|
|
|
# an old version of coreutils in real_root does not support
|
|
|
|
# an old version of coreutils in real_root does not support
|
|
|
|
# that style, noted by Weeve
|
|
|
|
# that style, noted by Weeve
|
|
|
|
|
|
|
|
# Well, changed it back to using [ ] for 3.0.1_beta10 too many
|
|
|
|
|
|
|
|
# people reporting with newer binutils that using 'test' does
|
|
|
|
|
|
|
|
# not work for some reason
|
|
|
|
|
|
|
|
|
|
|
|
if test "${USE_DEVFS_NORMAL}" -eq "1" -a "${CDROOT}" -eq "0"
|
|
|
|
if [ "${USE_DEVFS_NORMAL}" -eq "1" -a "${CDROOT}" -eq "0" ]
|
|
|
|
then
|
|
|
|
then
|
|
|
|
# must mount a new devfs before we can
|
|
|
|
# must mount a new devfs before we can
|
|
|
|
# umount the old one for some reason
|
|
|
|
# umount the old one for some reason
|
|
|
@ -272,7 +275,7 @@ then
|
|
|
|
# asking questions!
|
|
|
|
# asking questions!
|
|
|
|
umount /dev
|
|
|
|
umount /dev
|
|
|
|
umount /proc
|
|
|
|
umount /proc
|
|
|
|
elif test "${CDROOT}" -eq "1"
|
|
|
|
elif [ "${CDROOT}" -eq "1" ]
|
|
|
|
then
|
|
|
|
then
|
|
|
|
# If automount at boot was on with devfs, we'll want to umount it
|
|
|
|
# If automount at boot was on with devfs, we'll want to umount it
|
|
|
|
# also umount proc
|
|
|
|
# also umount proc
|
|
|
@ -289,5 +292,5 @@ fi
|
|
|
|
# here's the line it says we should do:
|
|
|
|
# here's the line it says we should do:
|
|
|
|
# exec chroot . /sbin/init </dev/console >/dev/console 2>&1
|
|
|
|
# exec chroot . /sbin/init </dev/console >/dev/console 2>&1
|
|
|
|
# not gonna though ....
|
|
|
|
# not gonna though ....
|
|
|
|
exec /sbin/init
|
|
|
|
exec chroot . /sbin/init ${CMDLINE} < /dev/console > /dev/consle 2>&1
|
|
|
|
|
|
|
|
|
|
|
|