Changeset 1830 in MondoRescue for branches/2.2.5/mindi/rootfs/sbin/init

Timestamp:

Dec 2, 2007, 12:24:17 AM (16 years ago)

Author:

Bruno Cornec

Message:

• start-nfs should NOT do exit => kernel panix as init exits

-some other fixes for init on denymods

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
+    echo "$DENY_MODS" | grep -q "usb-storage "
     if [ $? -eq 0 ]; then
         return
@@ -393 +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
+echo "$DENY_MODS" | grep -Eq 'uhcd_hci |usbhid |usbcore '
 if [ $? -eq 0 ]; then
     return
@@ -576 +576 @@
     for m in `find /lib/modules -name '*.ko*'`; do
         j=`basename $m | sed 's/\.ko.*$//'`
-        grep -q '$j ' $DENY_MODS
+        echo "$DENY_MODS" | grep -q "$j "
         if [ $? -eq 0 ]; then
+            echo "Denying $j..."
             continue
         fi
@@ -594 +595 @@
         echo "Inserting modules ..."
         insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
-        for i in $FORCE_MODS do;
+        for i in $FORCE_MODS; do
             MyInsmod $i
         done
@@ -631 +632 @@
 if [ "`grep -i denymods /proc/cmdline`" ]; then
     export DENY_MODS="`cat /proc/cmdline | sed 's~.*denymods=\"\(.*\)\".*~\1~'` mondonone"
+else
+    export DENY_MODS=" "
 fi
 
 if [ "`grep -i forcemods /proc/cmdline`" ]; then
     export FORCE_MODS="`cat /proc/cmdline | sed 's~.*forcemods=\"\(.*\)\".*~\1~'` mondonone"
+else
+    export FORCE_MODS=" "
 fi