Changeset 287 in MondoRescue for branches/2.06

Timestamp:

Jan 6, 2006, 12:05:49 PM (18 years ago)

Author:

andree

Message:

Modified and streamlined init:

• new function 'ExtractDataDisksAndLoadModules()' loads files from floppy or <n>.tar.gz images and subsequently loads modules to take advantage of the modules previously loaded
• removed now unnecessary second general module loading phase which speeds booting up somewhat
• start NFS only once all possible modules are loaded - for PXE this is immediately as beofre because everything is in the initrd, for ordinary NFS this is after the images and then the modules have been loaded

The long-term solution as disucssed on the mailing-list will probably be
to make the contents of mindi's 'NET_MODS' variable complete and
dynamic. Until this happens the above change will do.

File:

• branches/2.06/mindi/rootfs/sbin/init (modified) (3 diffs)

branches/2.06/mindi/rootfs/sbin/init

@@ -582 +582 @@
 
 
+ExtractDataDisksAndLoadModules() {
+    echo "Installing additional tools ..."
+    install-additional-tools
+    echo "Inserting modules ..."
+    insert-all-my-modules > $LOGFILE 2> $LOGFILE
+}
 
 # ------------------------ main -----------------------
@@ -613 +619 @@
 #-------------------------------
 UseTmpfs
-# Allows PXE boot by starting NFS earlier
-StartNfs
 if [ ! -e "/tmp/mondo-restore.cfg" ] ; then
     LogIt "Warning - /tmp/mondo-restore.cfg not found"
@@ -623 +627 @@
 #el
 if [ "`grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ] ; then
-    HandleTape
+        HandleTape
+    ExtractDataDisksAndLoadModules
+elif [ -e "/sbin/start-nfs" ] && [ "`grep -i pxe /proc/cmdline`" ]; then
+    StartNfs
+    imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+    if [ "$imgname" = "" ]; then
+        imgname="mondorescue"
+    fi
+    if [ "`grep -i prefix /proc/cmdline`" ] ; then
+        for i in `cat /proc/cmdline` ; do
+            if [ "`echo $i | grep -i prefix`" ] ; then
+                imgname=`echo $i | cut -d'=' -f2`
+            fi
+        done
+    fi
+    dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+    if [ "$dirimg" = "" ]; then
+        dirimg="/"
+    fi
+    LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"
+    losetup /dev/loop7 /tmp/isodir/$dirimg/$imgname-1.iso
+    mount -t iso9660 /dev/loop7 /mnt/cdrom
+    # Simulate a local CD
+    echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
+        CD_MOUNTED_OK=yes
+    ExtractDataDisksAndLoadModules
 else
+    HandleCDROMorFloppies
+    ExtractDataDisksAndLoadModules
     if [ -e "/sbin/start-nfs" ]; then
-        if [ "`grep -i pxe /proc/cmdline`" ]; then
-            LogIt "PXE boot found"
-        fi
-        imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-        if [ "$imgname" = "" ]; then
-            imgname="mondorescue"
-        fi
-        if [ "`grep -i prefix /proc/cmdline`" ] ; then
-            for i in `cat /proc/cmdline` ; do
-                if [ "`echo $i | grep -i prefix`" ] ; then
-                    imgname=`echo $i | cut -d'=' -f2`
-                fi
-            done
-        fi
-        dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-        if [ "$dirimg" = "" ]; then
-            dirimg="/"
-        fi
-        LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"
-        losetup /dev/loop7 /tmp/isodir/$dirimg/$imgname-1.iso
-        mount -t iso9660 /dev/loop7 /mnt/cdrom
-        # Simulate a local CD
-        echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
-        CD_MOUNTED_OK=yes
-    else
-            HandleCDROMorFloppies
+        StartNfs
     fi
 fi
 res=$?
-echo "Inserting modules ..."
-insert-all-my-modules > $LOGFILE 2> $LOGFILE
-echo "Installing additional tools ..."
-install-additional-tools
 SwapTheMountExecs
 ConfigureLoggingDaemons
-echo "Inserting modules again ..."
-insert-all-my-modules > $LOGFILE 2> $LOGFILE
 if [ -e "/tmp/USE-DEVFS" ] ; then
     umount /mnt/cdrom 2> /dev/null