denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #77259.

Browse Source 
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@167 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Tim Yamin 20 years ago
parent a913265a88
commit 433bbad70c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

22
generic/linuxrc
Unescape View File

@ -417,10 +417,10 @@ then
mount -t ext2 -o ro /newroot/dev/loop0 /newroot/mnt/livecd mount -t ext2 -o ro /newroot/dev/loop0 /newroot/mnt/livecd
FS_LOCATION='mnt/livecd' FS_LOCATION='mnt/livecd'
umount /dev umount /dev
elif [ "${LOOPTYPE}" = 'zisofs' ] elif /tmp/.initrd/bin/[ "${LOOPTYPE}" = 'zisofs' ]
then then
FS_LOCATION="mnt/cdrom/${LOOPEXT}${LOOP}" FS_LOCATION="mnt/cdrom/${LOOPEXT}${LOOP}"
elif [ "${LOOPTYPE}" = 'noloop' ] elif /tmp/.initrd/bin/[ "${LOOPTYPE}" = 'noloop' ]
then then
FS_LOCATION='mnt/cdrom' FS_LOCATION='mnt/cdrom'
fi fi
@ -437,7 +437,7 @@ else
mkdir -p /newroot/tmp/.initrd mkdir -p /newroot/tmp/.initrd
fi fi
[ ! -e /newroot/dev/console ] && mknod /newroot/dev/console c 5 1 /tmp/.initrd/bin/[ ! -e /newroot/dev/console ] && mknod /newroot/dev/console c 5 1
echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting" echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting"
cd /newroot cd /newroot
@ -445,22 +445,22 @@ mkdir /newroot/proc /newroot/sys 2>/dev/null
pivot_root . tmp/.initrd pivot_root . tmp/.initrd
echo -n '.' echo -n '.'
if [ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ] if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]
then then
umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!' umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!'
mount -n --move /tmp/.initrd/dev dev || echo '*: Failed to move over the /dev tree!' mount -n --move /tmp/.initrd/dev dev || echo '*: Failed to move over the /dev tree!'
rm -rf /tmp/.initrd/dev || echo '*: Failed to remove the initrd /dev!' rm -rf /tmp/.initrd/dev || echo '*: Failed to remove the initrd /dev!'
elif [ "${USE_UDEV_NORMAL}" -eq '1' ] elif /tmp/.initrd/bin/[ "${USE_UDEV_NORMAL}" -eq '1' ]
then then
[ -e /tmp/.initrd/dev/fd ] && rm /tmp/.initrd/dev/fd /tmp/.initrd/bin/[ -e /tmp/.initrd/dev/fd ] && rm /tmp/.initrd/dev/fd
[ -e /tmp/.initrd/dev/stdin ] && rm /tmp/.initrd/dev/stdin /tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stdin ] && rm /tmp/.initrd/dev/stdin
[ -e /tmp/.initrd/dev/stdout ] && rm /tmp/.initrd/dev/stdout /tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stdout ] && rm /tmp/.initrd/dev/stdout
[ -e /tmp/.initrd/dev/stderr ] && rm /tmp/.initrd/dev/stderr /tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stderr ] && rm /tmp/.initrd/dev/stderr
[ -e /tmp/.initrd/dev/core ] && rm /tmp/.initrd/dev/core /tmp/.initrd/bin/[ -e /tmp/.initrd/dev/core ] && rm /tmp/.initrd/dev/core
umount /tmp/.initrd/dev || echo '*: Failed to unmount the initrd /dev!' umount /tmp/.initrd/dev || echo '*: Failed to unmount the initrd /dev!'
umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!' umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!'
umount /tmp/.initrd/sys || echo '*: Failed to unmount the initrd /sys!' umount /tmp/.initrd/sys || echo '*: Failed to unmount the initrd /sys!'
elif [ "${CDROOT}" -eq '1' ] elif /tmp/.initrd/bin/[ "${CDROOT}" -eq '1' ]
then then
umount /tmp/.initrd/proc || echo "*: Failed to unmount the initrd /proc!" umount /tmp/.initrd/proc || echo "*: Failed to unmount the initrd /proc!"
umount /dev 2>/dev/null umount /dev 2>/dev/null

Write Preview
Loading…
Cancel
Save