Use partition label to find cdrom

[rrq/tiniest.git] / init / init

diff --git a/init/init b/init/init
index 23b40ac0de3d5d4f55a879066c85697a7d9b984a..bf114bcd87918ac4ad52c4b83c8d6c6c9ecd0a14 100644 (file)
--- a/init/init
+++ b/init/init
@@ -33,23 +33,9 @@ echo
 echo "Continuing..."
 echo
 
-# Determine root fs from FSUUID provided by syslinux SYSAPPEND
-for I in 1 2 3 4 5 ; do
-    sleep $I
-    mount UUID=${FSUUID} /boot && break
-    if [ $I -eq 5 ] ; then
-       echo "CANNOT MOUNT UUID=${FSUUID}"
-       echo "Starting emergency shell ..."
-       exec /bin/sh
-    fi
-done
-DEV2="$(grep /boot /proc/mounts | sed 's/ .*//')"
-umount /boot
-DEV="${DEV2%?}"
-
-mount $DEV /cdrom
+mount LABEL=TINIEST /cdrom
 mount -t ramfs -o size=1G initrd /target
 
 gunzip < $(find /cdrom -name initrd.gz ) | ( cd /target && cpio -i )
-#exec /bin/sh
+exec /bin/sh
 exec switch_root -c /dev/console /target /init