Changeset 3310 in MondoRescue for branches/3.2/mindi/rootfs

Timestamp:

Jul 3, 2014, 10:24:14 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Remove EXTRA_MODS variable as it was leading to modules missing at restore time. Now part of CDROM_MODS and were anyway loaded 99% of the time.
• Optimize modules list computation between mindi and restore init script.
• As a consequence do not try to relaod modules list twice as there is not difference in modules list anymore, eveything is in the boot part.

File:

• branches/3.2/mindi/rootfs/etc/init.d/rcS (modified) (4 diffs)

branches/3.2/mindi/rootfs/etc/init.d/rcS

@@ -795 +795 @@
 
     echo "Searching for modules to install..."
-    lismod=`find /lib/modules -name '*\.ko*' -o -name '*\.o*'`
+    if [ ! -e /tmp/modules ]; then
+        LogIt "Unable to find the modules list. Computing one. This may take some time..."
+        lismod=`find /lib/modules -name '*\.ko*' -o -name '*\.o*'`
+        for m in $lismod; do
+            k=`basename $m | sed 's/\.ko.*$//'`
+            j=`basename $k | sed 's/\.o.*$//'`
+            echo "$j" >> /tmp/modules
+        done
+    fi
     # loading forced modules first
-    for m in $lismod; do
-        k=`basename $m | sed 's/\.ko.*$//'`
-        j=`basename $k | sed 's/\.o.*$//'`
+    for j in `cat /tmp/modules`; do
         echo "$FORCE_MODS" | grep -q "$j "
         if [ $? -eq 0 ]; then
@@ -806 +812 @@
         fi
     done
-    for m in $lismod; do
-        k=`basename $m | sed 's/\.ko.*$//'`
-        j=`basename $k | sed 's/\.o.*$//'`
+    for j in `cat /tmp/modules`; do
         echo "$DENY_MODS" | grep -q "$j "
         if [ $? -eq 0 ]; then
@@ -855 +859 @@
     # BCO: test return value
     install-additional-tools
-    # Keep the kernel silent again
-    PKLVL=`cut -f1 /proc/sys/kernel/printk`
-    echo 0 > /proc/sys/kernel/printk
-    ModprobeAllModules
-    echo $PKLVL > /proc/sys/kernel/printk
 
     # Retry failed udev events now that local filesystems are mounted read-write
@@ -882 +881 @@
 export PATH GROOVY USER LOGFILE ARCH
 
-mount -o remount rw /
+mount -o remount,rw /
 rm -f $LOGFILE