From 8aef53522816fe7363060647ab9495aa27d75a1e Mon Sep 17 00:00:00 2001
From: Jan Steffens <jan.steffens@gmail.com>
Date: Tue, 15 Jun 2010 00:37:00 +0200
Subject: Fix autodetect bitrot

This error went unnoticed after auto_modules was switched over to
resolve-modalias. As a result, ata_generic and ide-generic weren't
filtered anymore.
---
 install/autodetect | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'install/autodetect')

diff --git a/install/autodetect b/install/autodetect
index 63e85c2..c1a6b76 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -4,10 +4,8 @@ install ()
 {
     MODULE_FILE="${TMPDIR}/autodetect_modules"
     #blegh, we'll let /tmp clean itself up
-    AUTODETECT="$(auto_modules -e '/scsi/' -e '/block' -e '/fusion/' \
-                    -e '/usb/' -e '/ide/' -e '/ieee1394/' -e '/cdrom' \
-                    -e '/net/' -e '/pcmcia' -e '/ata' \
-                  | grep -v -e 'ata_generic.ko' -e 'ide-generic.ko')"
+    AUTODETECT="$(auto_modules | \
+                  sed -e 's/ata_generic//g' -e 's/ide_generic//g')"
 
 
     #Filesystem detection, use sysfs instead of /proc
@@ -45,8 +43,7 @@ install ()
         err "User does not have proper permissions to read superblocks, raid and filesystem modules are not detected"
     fi
 
-    for m in ${AUTODETECT}; do
-        modname="$(basename ${m%%\.ko})"
+    for modname in ${AUTODETECT}; do
         grep "^${modname}$" "${MODULE_FILE}" >/dev/null 2>&1 && continue
         case "${m}" in 
             #*/ieee1394/*) echo -e "sbp2\nsd_mod\nsr_mod" >> "${MODULE_FILE}";;
-- 
cgit v1.2.3-24-g4f1b


From a1c547e7e8e5c4a420a763451eb6af49b329af68 Mon Sep 17 00:00:00 2001
From: Jan Steffens <jan.steffens@gmail.com>
Date: Tue, 15 Jun 2010 17:00:54 +0200
Subject: Implement explicit module depends

Needed to get libcrc32c and therefore btrfs to work. Also remove the
equivalent section in autodetect, which wasn't working anyway.
---
 install/autodetect | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'install/autodetect')

diff --git a/install/autodetect b/install/autodetect
index c1a6b76..914a96b 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -43,19 +43,8 @@ install ()
         err "User does not have proper permissions to read superblocks, raid and filesystem modules are not detected"
     fi
 
-    for modname in ${AUTODETECT}; do
-        grep "^${modname}$" "${MODULE_FILE}" >/dev/null 2>&1 && continue
-        case "${m}" in 
-            #*/ieee1394/*) echo -e "sbp2\nsd_mod\nsr_mod" >> "${MODULE_FILE}";;
-            *ext3*) echo "jbd" >> "${MODULE_FILE}" ;;
-            *ext4*) echo -e "jbd2\nmbcache\ncrc16" >> "${MODULE_FILE}" ;;
-            *afs*) echo "rxrpc" >> "${MODULE_FILE}" ;;
-            *cramfs*) echo "zlib_inflate" >> "${MODULE_FILE}" ;;
-            *isofs*) echo "zlib_inflate" >> "${MODULE_FILE}" ;;
-            *msdos*) echo "fat" >> "${MODULE_FILE}" ;;
-            *vfat*) echo -e "fat\nnls_cp437" >> "${MODULE_FILE}" ;;
-            *ocfs2*) echo -e "ocfs2_dlm\njbd\nocfs2_nodemanager\nconfigfs" >> "${MODULE_FILE}" ;;
-        esac
+    for m in ${AUTODETECT}; do
+        modname="$(basename ${m%.ko})"
         echo "${modname}" >> "${MODULE_FILE}"
     done
 
-- 
cgit v1.2.3-24-g4f1b