Changeset 1727 in MondoRescue for branches/2.2.5/mindi/mindi

Timestamp:

Oct 28, 2007, 7:45:35 PM (16 years ago)

Author:

Bruno Cornec

Message:

• exclusion of modules denied now works
• Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep

File:

• branches/2.2.5/mindi/mindi (modified) (3 diffs)

branches/2.2.5/mindi/mindi

@@ -2846 +2846 @@
         list_of_groovy_mods="$list_of_groovy_mods $EXTRA_MODS"
     fi
+    for i in $DENY_MODS; do
+        echo "Removing $i from the list of modules to load" >> $LOGFILE
+        list_of_groovy_mods=`echo ${list_of_groovy_mods} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
+    done
+
     [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS."
     for i in $list_of_groovy_mods ; do
         floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
-    done
-    for i in $DENY_MODS; do
-        floppy_modules=`echo ${floppy_modules} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     done
     for i in $floppy_modules ; do
@@ -2857 +2859 @@
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        cp -df $i $mountpoint/ 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
+        cp --parents -pdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
+        if [ "`echo "$i" | grep -F ".gz"`" ]; then
+                gunzip -f $mountpoint/$i
+                i=`echo $i | sed 's/.gz//'`
+        fi
+        ln -s $mountpoint/$i $mountpoint 2>/dev/null || LogIt "Unable to link `basename $i` to $mountpoint"
         [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     done
+    # Also copy modules.dep in case of udev so that normal modprobe works
+    p=`echo $i | cut -d/ -f1-3`
+    cp -df $p/modules.dep $mountpoint/$p 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
     if [ ! -e "/sbin/devfsd" ] || [ "$disksize" -lt "2880" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
         echo "Deleting devfsd daemon from ramdisk" >> $LOGFILE
@@ -3128 +3138 @@
 # If libata v2 is used then remove ide-generic as it will perturbate boot
 if [ "`echo $MODULES | grep libata`" ]; then
-    if [ $laver -ge 2 ]; then
+    if [ "$laver" = "2" ]; then
         DENY_MODS="$DENY_MODS ide-generic"
-        echo "ide-generic removed from module list as your system uses libata v2+"
+        echo "ide-generic removed from module list as your system uses libata v2+" >> $LOGFILE
         echo "-------------" >> $LOGFILE
     fi