Changeset 1922 in MondoRescue for branches/2.2.6/mindi/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

File:

• branches/2.2.6/mindi/mindi (modified) (4 diffs)

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