Changeset 1830 in MondoRescue

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

Location:

branches/2.2.5/mindi/rootfs/sbin

Files:

• init (modified) (5 diffs)
• start-nfs (modified) (1 diff)

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
 

branches/2.2.5/mindi/rootfs/sbin/start-nfs

@@ -35 +35 @@
 done
 
-if [ "$ipdev" = "" ] && [ "$ipconf" = "" ]; then
-    # No network configuration neither stored during archive
-    # nor on cmdline so no network wanted => exiting
-    exit 0
-else
+if [ "$ipdev" != "" ] || [ "$ipconf" != "" ]; then
+    # Network configuration stored during archive
+    # or on cmdline so network wanted => starting it
     LogIt "Starting Network..."
+
+    # Activate loobback
+    ifconfig lo 127.0.0.1
+
+    echo "$ipconf" | grep -q "dhcp"
+    if [ $? -eq 0 ]; then
+        ipdev=`echo $ipconf | cut -d: -f1`
+        LogIt "Making DHCP request on $ipdev"
+        udhcpc -i $ipdev
+    else
+        if [ "$ipconf" != "" ]; then
+            ipdev=`echo $ipconf | cut -d: -f1`
+            ipaddress=`echo $ipconf | cut -d: -f2`
+            ipnetmask=`echo $ipconf | cut -d: -f3`
+            ipbroadcast=`echo $ipconf | cut -d: -f4`
+            ipgateway=`echo $ipconf | cut -d: -f5`
+        fi
+        LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
+        ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
+        route add default gw $ipgateway
+    fi
+
+    # ping server helps waking interface up
+    LogIt "Pinging NFS server..."
+    nfs_server_ipaddr=`echo $nfsmount | cut -d: -f1`
+    ping -c $ipcount $nfs_server_ipaddr 
+
+    # Finally mounts the NFS share
+    LogIt "Mounting NFS share ($nfsmount) on /tmp/isodir..."
+    mount -t nfs -o nolock $nfsmount /tmp/isodir
+    
+    LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
+    mount -o ro -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom
 fi
-
-# Activate loobback
-ifconfig lo 127.0.0.1
-
-echo "$ipconf" | grep -q "dhcp"
-if [ $? -eq 0 ]; then
-    ipdev=`echo $ipconf | cut -d: -f1`
-    LogIt "Making DHCP request on $ipdev"
-    udhcpc -i $ipdev
-else
-    if [ "$ipconf" != "" ]; then
-        ipdev=`echo $ipconf | cut -d: -f1`
-        ipaddress=`echo $ipconf | cut -d: -f2`
-        ipnetmask=`echo $ipconf | cut -d: -f3`
-        ipbroadcast=`echo $ipconf | cut -d: -f4`
-        ipgateway=`echo $ipconf | cut -d: -f5`
-    fi
-    LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
-    ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
-    route add default gw $ipgateway
-fi
-
-# ping server helps waking interface up
-LogIt "Pinging NFS server..."
-nfs_server_ipaddr=`echo $nfsmount | cut -d: -f1`
-ping -c $ipcount $nfs_server_ipaddr 
-
-# Finally mounts the NFS share
-LogIt "Mounting NFS share ($nfsmount) on /tmp/isodir..."
-mount -t nfs -o nolock $nfsmount /tmp/isodir
-
-LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
-mount -o ro -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom