From: Ralph Ronnquist <rrq@rrq.au>
Date: Sun, 5 Nov 2023 11:17:50 +0000 (+1100)
Subject: Minor cleanup
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=9ae68a6213c2181b33f3bc18e21c294445047b2d;hp=141a9dc5e0adf2ffa431643d4561170c2c1b5bc4;p=rrq%2Ftiniest.git

Minor cleanup
---

diff --git a/init/init b/init/init
index 018a78b..6448bd6 100644
--- 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,14 +27,24 @@ done
 #-- network
 # e1000
 
+sleep 2
 echo
-echo "Continuing..."
+echo "Hi there ..."
 echo
 
+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 LABEL=TINIEST /cdrom
 mount -t ramfs -o size=1G initrd /target
 
 gunzip < $(find /cdrom -name initrd.gz ) | ( cd /target && cpio -i )
 exec setsid cttyhack sh -i
+###################################
 exec /bin/sh
 exec switch_root -c /dev/console /target /init