Changeset 2006 in MondoRescue

Timestamp:

Aug 10, 2008, 5:09:53 PM (16 years ago)

Author:

Bruno Cornec

Message:

Fix #243 parse /etc/modprobe.conf, look for include statements, and then add the included files to the dependency list (Michael Shapiro)

File:

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

branches/2.2.7/mindi/mindi

@@ -51 +51 @@
 
 # ide-probe-mod
-IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks  pata_sis amd74xx"
+IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks pata_sis amd74xx"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod"
@@ -1749 +1749 @@
 
 
+ParseModprobeForIncludes() {
+local MODPROBE_CONF mpincfile includes include
+
+MODPROBE_CONF=/etc/modprobe.conf
+mpincfile=$1
+touch $mpincfile
+if [ -a $MODPROBE_CONF ]; then
+    includes=$(awk '/^[ \t]*include[ \t]+/ {if(NF>=2){print $2}}' $MODPROBE_CONF|sort|uniq)
+    if [ -n "$includes" ]; then
+        for include in $includes
+        do
+            if [ -a "$include" ]; then
+                echo $include >> $mpincfile
+            fi
+        done
+    fi
+fi
+}
+
+
 PrepareDataDiskImages() {
-    local needlist bigdir diskdir imagesdir res i j k old_pwd lines lfiles
+    local needlist bigdir diskdir imagesdir res i j k old_pwd lines lfiles includefile
 
     imagesdir=$MINDI_CACHE
@@ -1758 +1778 @@
     mkdir -p $bigdir/usr/bin
     mkdir -p $bigdir/usr/sbin
+    includefile=$MINDI_TMP/$$.includefile.txt
 
     lfiles="$DEPLIST_FILE"
     lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
-    cat $lfiles | GenerateGiantDependencyList $needlist $lines
+    ParseModprobeForIncludes $includefile
+    lines=${lines}+`wc -l $includefile`
+    cat $lfiles $includefile | GenerateGiantDependencyList $needlist $lines
     res=$?
+    rm -f $includefile
     if [ "$YOUR_KERNEL_SUCKS" ]; then
         pwd=`pwd`