# HG changeset patch # User Christopher Rogers # Date 1298371813 0 # Node ID dcecdf9faad50ce86b359bd3a020f82da8cac37f # Parent 7071725cd1cceb204c6ed8fb5c253a09dc4add0f Update initramfs init script. diff -r 7071725cd1cc -r dcecdf9faad5 initramfs/init --- a/initramfs/init Thu Feb 03 11:55:16 2011 +0000 +++ b/initramfs/init Tue Feb 22 10:50:13 2011 +0000 @@ -2,19 +2,22 @@ launch_init() { - umount /proc + [ -d /proc/sys ] && umount /proc echo -e "\\033[70G[ \\033[1;33mOK\\033[0;39m ]" exec /sbin/switch_root mnt /sbin/init } launch_init_modular() { + [ -d /proc/sys ] && umount /proc echo -e "\\033[70G[ \\033[1;33mOK\\033[0;39m ]" [ -d /mnt/initramfs ] || mkdir -p /mnt/initramfs SYS_DIR="dev bin etc boot lib sbin home root usr var" for dir in $SYS_DIR; do cp -a /$dir /mnt/initramfs done + [ -f /mnt/dev/sdc ] || mknod /mnt/dev/sdc b 8 32 + [ -f /mnt/dev/sdc1 ] || mknod /mnt/dev/sdc1 b 8 33 MK_DIR="sys proc tmp media mnt" for dir1 in $MK_DIR; do mkdir -p /mnt/initramfs/$dir1 @@ -24,7 +27,7 @@ failed() { - umount /proc + [ -d /proc/sys ] && umount /proc echo -e "\\033[70G[ \\033[1;31mFailed\\033[0;39m ]" } @@ -156,7 +159,6 @@ [ -n "$size" ] || size="-o size=90%" if [ $free -lt 100 ] || ! mount -t tmpfs $size tmpfs /mnt; then echo -e "\\033[70G[ \\033[1;33mSkipped\\033[0;39m]" - umount /proc exec /sbin/init fi for i in $(ls -a /); do