Changeset 1829 in MondoRescue

Timestamp:

Dec 1, 2007, 10:44:48 PM (16 years ago)

Author:

Bruno Cornec

Message:

Adds boot options denymods (for udev) and forcemods (if not udev)

File:

• branches/2.2.5/mindi/rootfs/sbin/init (modified) (5 diffs)

branches/2.2.5/mindi/rootfs/sbin/init

@@ -157 +157 @@
 HandleCDROMorFloppies() {
     # Just in case we have an iLO ensure we will map it correctly
+    grep -q "usb-storage " $DENY_MODS
+    if [ $? -eq 0 ]; then
+        return
+    fi
     echo "Activating a potential USB Storage device"
-    if [ -e "/tmp/USE-UDEV" ] ; then
-        if [ -f usb-storage.ko ] || [ -f usb-storage.ko.gz ]; then
+    if [ -f usb-storage.ko ] || [ -f usb-storage.ko.gz ]; then
+        if [ -e "/tmp/USE-UDEV" ] ; then
             modprobe -q usb-storage
-        fi
-    else
-        if [ -f usb-storage.ko ] || [ -f usb-storage.ko.gz ]; then
+        else
             insmod usb-storage.ko*
         fi
@@ -391 +393 @@
 # Prepare minimal USB env in case we have USB kbd such as with iLO
 [ -d /proc/bus/usb ] && ! grep -q /proc/bus/usb /proc/mounts && mount -t usbfs none /proc/bus/usb
+grep -Eq 'uhcd_hci |usbhid |usbcore ' $DENY_MODS
+if [ $? -eq 0 ]; then
+    return
+fi
 if [ -e "/tmp/USE-UDEV" ] ; then
     if [ -f uhcd_hci.ko ] || [ -f uhcd_hci.ko.gz ]; then
@@ -570 +576 @@
     for m in `find /lib/modules -name '*.ko*'`; do
         j=`basename $m | sed 's/\.ko.*$//'`
+        grep -q '$j ' $DENY_MODS
+        if [ $? -eq 0 ]; then
+            continue
+        fi
+        echo "Probing $j..."
         modprobe -q $j
     done
@@ -583 +594 @@
         echo "Inserting modules ..."
         insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
+        for i in $FORCE_MODS do;
+            MyInsmod $i
+        done
     else
         ModprobeAllModules
@@ -614 +628 @@
 [ -d /proc/vmware ] && ! grep -q /vmfs /proc/mounts && mount -t vmfs /vmfs /vmfs
 rm -f /foozero
+
+if [ "`grep -i denymods /proc/cmdline`" ]; then
+    export DENY_MODS="`cat /proc/cmdline | sed 's~.*denymods=\"\(.*\)\".*~\1~'` mondonone"
+fi
+
+if [ "`grep -i forcemods /proc/cmdline`" ]; then
+    export FORCE_MODS="`cat /proc/cmdline | sed 's~.*forcemods=\"\(.*\)\".*~\1~'` mondonone"
+fi
 
 echo "Activating a potential USB keyboard/mouse"