Minor cleanup

[rrq/tiniest.git] / init / init

diff --git a/init/init b/init/init
index 23b40ac0de3d5d4f55a879066c85697a7d9b984a..6448bd65829558b2bf19c535b1f6c4fe3fa93bb4 100644 (file)
--- a/init/init
+++ b/init/init
@@ -5,19 +5,17 @@ echo
 echo "Starting..."
 echo
 
-mkdir /cdrom
-mkdir /target
+mkdir /cdrom /target /mnt
 
 for M in proc:/proc devtmpfs:/dev devpts:/dev/pts sysfs:/sys ; do
     mkdir -p ${M##*:}
     mount -t ${M%%:*} ${M%%:*} ${M##*:}
 done
 
-for M in ata_piix sd_mod sr_mod isofs vfat xhci-pci usb_storage ; do
-    modprobe $M
-    sleep 1
-done
-
+modprobe loop max_part=15
+cat <<EOF | xargs -n1 modprobe
+ata_piix sd_mod sr_mod isofs vfat xhci-pci usb_storage exfat ext4
+EOF
 #--- Automatic:
 # cdrom t10_pi crc64_rocksoft crc64 crc_t10dif crct10dif_common libata
 # scsi_mod scsi_common
@@ -29,27 +27,24 @@ done
 #-- network
 # e1000
 
+sleep 2
 echo
-echo "Continuing..."
+echo "Hi there ..."
 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%?}"
+exec setsid cttyhack sh -i
+###################################
+
+if mount LABEL=TINNIE /target ; then
+    exec setsid cttyhack sh -i
+    exec switch_root -c /dev/console /target /init
+fi
 
-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 setsid cttyhack sh -i
+###################################
+exec /bin/sh
 exec switch_root -c /dev/console /target /init