Changeset 1922 in MondoRescue for branches/2.2.6/mindi

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

Files:

• deplist.txt (modified) (4 diffs)
• mindi (modified) (4 diffs)
• rootfs/etc/conf.modules (deleted)
• rootfs/sbin/MyInsmod (deleted)
• rootfs/sbin/init (modified) (9 diffs)

branches/2.2.6/mindi/deplist.txt

@@ -25 +25 @@
 
 #-------------------------------- ESSENTIAL -----------------------------------
-fstab raidtab modules.conf conf.modules mondorestore modules.conf.local
+fstab raidtab 
+/usr/sbin/mondorestore
 /etc/mdadm/mdadm.conf /etc/mdadm.conf
 /sbin/ldconfig
@@ -33 +34 @@
 bzip2 bunzip2 lzop
 ctrlaltdel
-# Do not remove as they need to be aligned with the kernel
-insmod lsmod
+# Everything needed to handle modules correctly
+insmod lsmod /sbin/modprobe
+/etc/modprobe.d /etc/modprobe.conf /etc/modules.conf /etc/conf.modules /etc/modules.conf.local
+
 hosts host.conf resolv.conf hosts.allow hosts.deny nsswitch.conf
 klogd sysklogd
@@ -59 +62 @@
 # gdb valgrind /usr/lib/valgrind
 
-#----------------- For all you LVM users out there, much love -----------------
-LVMFILES:
-lvmiopversion lvchange lvcreate lvdisplay lvextend lvmchange lvmcreate_initrd lvmdiskscan lvmsadc lvmsar lvreduce lvremove lvrename lvscan pvchange pvcreate pvdata pvdisplay pvmove pvscan vgcfgbackup vgcfgrestore vgchange vgck vgcreate vgdisplay vgexport vgextend vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgscan vgsplit liblvm lvm lvm-10 /etc/lvm/lvm.conf
-#------------------------------------------------------------------------------
 #
 # Proliant extended support if available
@@ -68 +67 @@
 conrep cpqacuxe hponcfg
 lshw
+#----------------- For all you LVM users out there, much love -----------------
+LVMFILES:
+lvmiopversion lvchange lvcreate lvdisplay lvextend lvmchange lvmcreate_initrd lvmdiskscan lvmsadc lvmsar lvreduce lvremove lvrename lvscan pvchange pvcreate pvdata pvdisplay pvmove pvscan vgcfgbackup vgcfgrestore vgchange vgck vgcreate vgdisplay vgexport vgextend vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgscan vgsplit liblvm lvm lvm-10 /etc/lvm/lvm.conf
+#------------------------------------------------------------------------------

branches/2.2.6/mindi/mindi

@@ -1069 +1069 @@
 
 
-MakeModuleLoadingScript() {
-    local module fname params modpath kver outerloop i modpaths kver searchpath list_to_echo j
-    tmpmodprobe_flag=$1
-    outfile=$2
-    > $outfile || Die "Cannot create empty $outfile"
-    echo -en "#\041/bin/sh\n\n" >> $outfile
-    echo "echo -en \"Loading your modules...\"" >> $outfile
-    if [ "$YOUR_KERNEL_SUCKS" ] ; then
-        kver=$FAILSAFE_KVER
-        cd $MINDI_TMP
-        searchpath=lib/modules/$kver
-    else
-###
-### Sq-Modification ... Use kernelname for module search path if specified
-###
-        #kver=`uname -r`
-        if [ "${kernelname}" != "" ]
-        then
-            kver=${kernelname}
-        else
-            kver=`uname -r`
-        fi
-###
-### Sq-Modification end
-###
-        searchpath=/lib/modules/$kver
-    fi
-    
-    echo -en "for outerloop in 1 2 3 4 5 ; do\necho -en \".\"\n" >> $outfile
-    list_to_echo="$MODULES"
-    # Remove unwanted modules from list
-    for i in $DENY_MODS; do
-        list_to_echo=`echo ${list_to_echo} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
-        EXTRA_MODS=`echo ${EXTRA_MODS} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
-    done
-
-    # Make temporary modprobe.conf file if we are told so
-    if [ "$tmpmodprobe_flag" = "Y" ] ; then
-        infile="$MINDI_TMP/modprobe.conf.mindi"
-        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
-    else
-        infile="/etc/modules.conf"
-    fi
-
-    for module in $list_to_echo $EXTRA_MODS ; do
-        params=`sed -n "s/^options \\+$module \\+//p" $infile`
-        modpaths=`FindSpecificModuleInPath $searchpath $module`
-        for i in $modpaths ; do
-            echo "MyInsmod $i $params > /dev/null 2> /dev/null" \
-                | tr '.' '#' \
-                | sed s/#o#gz/#o/ \
-                | sed s/#o#gz/#o/ \
-                | sed s/#ko#gz/#ko/ \
-                | sed s/#ko#gz/#ko/ \
-                | tr '#' '.' >> $outfile
-            echo -en "$i added to module list.\n" >> $LOGFILE
-        done
-    done
-    echo -en "done\n" >> $outfile
-    echo "echo \"Done.\"" >> $outfile
-    chmod +x $outfile
-    cd /
-    # Remove temporary modprobe.conf file if we have created one
-    if [ "$tmpmodprobe_flag" = "Y" ] ; then
-        rm -f $infile
-    fi
-}
-
-
 MakeMountlist() {
     local scratchdir mountlist all_partitions current_partition \
@@ -2555 +2486 @@
     cd $old_pwd
     echo -en "..."
-    MakeModuleLoadingScript $TMPMODPROBE_FLAG $mountpoint/sbin/insert-all-my-modules
-    echo -en "..."
     old_pwd=`pwd`
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
@@ -2722 +2651 @@
 echo "-----------------------------" >> $LOGFILE
 
-if [ -e "/etc/conf.modules" ] && [ ! -e "/etc/modules.conf" ] ; then
-    LogIt "WARNING - Ancient distro detected." 1
-    ln -sf /etc/conf.modules /etc/modules.conf
-fi
 [ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && ln -sf /sbin/mkdosfs /sbin/mkfs.vfat
 
@@ -2760 +2685 @@
 
 [ "`uname -r | grep "2.4.[0-6]" | grep -v "2.4.[0-9][0-9]"`" != "" ] &&  echo "WARNING! Your kernel may have buggy loopfs code. Consider upgrading to 2.4.7"
-# If we have a 2.6 kernel, the system uses module-init-tools which means that we
-# may have the modprobe configuration spread out across multiple files in
-# directory /etc/modprobe.d. If this is the case we concatenate these files into
-# a temporary file for further processing. Otherwise we continue in the standard
-# way. Note further that in case /etc/modprobe.d exists, we use it and ignore
-# /etc/modprobe.conf which is exactly what module-init-tools does. The temporary
-# modprobe.conf file is created in MakeModuleLoadingScript. AL041128.
-if [ -d "/etc/modprobe.d" ] && [ "`uname -r | cut -c1-3`" = "2.6" ] ; then
-    TMPMODPROBE_FLAG="Y"
-else
-    TMPMODPROBE_FLAG="N"
-    [ -e "/etc/modprobe.conf" ] && [ ! -e "/etc/modules.conf" ] && ln -sf /etc/modprobe.conf /etc/modules.conf
-    [ ! -e "/etc/modules.conf" ] && Die "/etc/modules.conf not found; you may have to create a softlink from /etc/conf.modules to /etc/modules.conf; of course, all good distros use modules.conf anyway..."
-fi
 
 # Update the PATH variable if incomplete

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