Changeset 1922 in MondoRescue for branches/2.2.6/mindi/rootfs/sbin

Timestamp:

Apr 17, 2008, 12:32:36 PM (16 years ago)

Author:

Bruno Cornec

Message:

• MakeModuleLoadingScript (mindi), MyInsmod, InsertEssentialModules (init) removed
• Simplification of modules handling when not using udev, which makes code cleaner and more common with the udev code.
• Usage of modprobe systematically.
• Do not mess with modules.conf anymore. Just use what is in deplist.txt

Location:

branches/2.2.6/mindi/rootfs/sbin

Files:

• MyInsmod (deleted)
• init (modified) (9 diffs)

branches/2.2.6/mindi/rootfs/sbin/init

@@ -79 +79 @@
     openvt 7 /bin/sh /sbin/wait-for-petris
     openvt 8 /usr/bin/tail -f $LOGFILE
+    # May avoid shell error messages
+    chmod 666 /dev/tty* /dev/console
 }
 
@@ -162 +164 @@
     fi
     echo "Activating a potential USB Storage device"
-    if [ -f usb-storage.ko ] || [ -f usb-storage.ko.gz ]; then
-        if [ -e "/tmp/USE-UDEV" ] ; then
-            modprobe -q usb-storage
-        else
-            insmod usb-storage.ko*
-        fi
-    fi
+    modprobe -q usb-storage
     for i in 1 2 3 4 5 6 7 8 9 10 ; do
         sleep 1
@@ -199 +195 @@
 HowMuchFreeSpaceOnRamdisk() {
    df -m -P | grep /dev/ram | head -n1 | tr -s '\t' ' ' | cut -d' ' -f4
-}
-
-
-
-InsertEssentialModules() {
-#   Load the VIA IDE module first thing if it exists (requires ide-core).
-#   This is to ensure that DMA is working for VIA chipsets with 2.6 kernels.
-    for module in /ide-core.ko* /via82cxxx.ko*; do
-        [ -f "$module" ] && MyInsmod $module > /dev/null 2> /dev/null
-    done
-#   Then load the remaining modules in normal (i.e. arbitrary) order.
-    for j in 1 2 3 4 5 ; do
-        for i in `ls /*.*o* 2> /dev/null` ; do
-            [ -f "$i" ] && MyInsmod $i > /dev/null 2> /dev/null
-        done
-    done
 }
 
@@ -314 +294 @@
     fi
     create_dev_makedev
-    # May avoid shell error messages
-    chmod 644 /dev/tty*
     if [ -x /sbin/udevsettle ]; then
         /sbin/udevsettle
@@ -389 +367 @@
     return
 fi
-if [ -e "/tmp/USE-UDEV" ] ; then
-    if [ -f uhcd_hci.ko ] || [ -f uhcd_hci.ko.gz ]; then
-        modprobe -q uhcd_hci
-    fi
-    if [ -f usbhid.ko ] || [ -f usbhid.ko.gz ]; then
-        modprobe -q usbhid
-    fi
-else
-    if [ -f uhcd_hci.ko ]; then
-        insmod uhcd_hci.ko
-    fi
-    if [ -f usbhid.ko ]; then
-        insmod usbcore.ko
-        insmod usbhid.ko
-    fi
-fi
+modprobe -q uhcd_hci
+modprobe -q usbhid
 }
 
@@ -413 +377 @@
         LogIt "Scanning LVM's..." 1
         if which lvm ; then
-            MyInsmod dm-mod
-            MyInsmod dm_mod
+            modprobe -q dm-mod
+            modprobe -q dm_mod
             lvm vgscan --mknodes
         else
@@ -566 +530 @@
 ModprobeAllModules() {
 
-    for m in `find /lib/modules -name '*.ko*'`; do
+    for m in `find /lib/modules -name '*\.ko*' -o -name '*\.o*'`; do
         j=`basename $m | sed 's/\.ko.*$//'`
+        j=`basename $m | sed 's/\.o.*$//'`
         echo "$DENY_MODS" | grep -q "$j "
         if [ $? -eq 0 ]; then
@@ -584 +549 @@
     PKLVL=`cut -f1 /proc/sys/kernel/printk`
     echo 0 > /proc/sys/kernel/printk
-    if [ ! -e "/tmp/USE-UDEV" ] ; then
-        echo "Inserting modules ..."
-        insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
-        for i in $FORCE_MODS; do
-            MyInsmod $i
-        done
-    else
-        ModprobeAllModules
-    fi
+    ModprobeAllModules
     echo $PKLVL > /proc/sys/kernel/printk
 }
@@ -654 +611 @@
 PKLVL=`cut -f1 /proc/sys/kernel/printk`
 echo 0 > /proc/sys/kernel/printk
-if [ ! -e "/tmp/USE-UDEV" ] ; then
-    InsertEssentialModules
-else
-    ModprobeAllModules
-fi
+ModprobeAllModules
 echo $PKLVL > /proc/sys/kernel/printk