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

Timestamp:

Nov 19, 2007, 1:13:50 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Increase BOOT_SIZE and EXTRA_SIZE to support features such as HW recovery
• Handles udev.files files which could be symlinks
• Improve udev support for distro with compressed modules (mdv e.g.)
• Fix modules.dep copy
• /sbin/pam_console_apply is needed by mdv udev conf
• Adds support for nohw boot option to avoid re-setuping the HW conf

File:

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

branches/2.2.5/mindi/rootfs/sbin/init

@@ -196 +196 @@
 #   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
+    for module in /ide-core.ko* /via82cxxx.ko*; do
         [ -f "$module" ] && MyInsmod $module > /dev/null 2> /dev/null
     done
@@ -315 +315 @@
     answer="NO"
 
+    grep -q nohw /proc/cmdline
+    if [ "$?" -eq 0 ]; then
+        return
+    fi
     if [ -x ./mindi-rsthw ]; then
         grep -q RESTORE /proc/cmdline
         if [ "$?" -ne 0 ]; then
-            clear
+            #clear
             echo "*********************************************************************"
             echo "Do you want to restore the HW configuration of the original machine ?"
@@ -362 +366 @@
 [ -d /proc/bus/usb ] && ! grep -q /proc/bus/usb /proc/mounts && mount -t usbfs none /proc/bus/usb
 if [ -e "/tmp/USE-UDEV" ] ; then
-    if [ -f usbhid.ko ]; then
+    if [ -f usbhid.ko || -f usbhid.ko.gz ]; then
         modprobe -q usbhid
     fi
-    if [ -f uhcd_hci.ko ]; then
+    if [ -f uhcd_hci.ko || -f uhcd_hci.ko.gz ]; then
         modprobe -q uhcd_hci
     fi
 else
     if [ -f uhcd_hci.ko ]; then
-        insmod uhcd_hci.ko
+        insmod uhcd_hci.ko*
     fi
     if [ -f usbhid.ko ]; then
-        insmod usbcore.ko
-        insmod usbhid.ko
+        insmod usbcore.ko*
+        insmod usbhid.ko*
     fi
 fi
@@ -538 +542 @@
 ModprobeAllModules() {
 
-    for m in *.ko; do
-        j=`echo $m | sed 's/\.ko$//'`
-        if [ -e $j ]; then
-            modprobe -q $j
-        fi
+    for m in *.ko*; do
+        j=`echo $m | sed 's/\.ko.*$//'`
+        modprobe -q $j
     done
 }