Changeset 2006

Timestamp:

08/10/08 17:09:53 (2 years ago)

Author:

bruno

Message:

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

Files:

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

branches/2.2.7/mindi/mindi

@@ -51 +51 @@
-
-# ide-probe-mod
- 
+
-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() {
-
+ 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`
-
+
+
+
-    res=$?
+    rm -f $includefile
-    if [ "$YOUR_KERNEL_SUCKS" ]; then
-        pwd=`pwd`