diff options
| author | Jan Steffens <jan.steffens@gmail.com> | 2010-06-15 00:37:00 +0200 |
|---|---|---|
| committer | Jan Steffens <jan.steffens@gmail.com> | 2010-06-19 02:05:18 +0200 |
| commit | 8aef53522816fe7363060647ab9495aa27d75a1e (patch) | |
| tree | 39e4fafb5bb789c2068285c9e882a3f03ffb596e | |
| parent | be2270384ce03d7a17e2cf6a0ec0c5a1f861c1ff (diff) | |
| download | mkinitcpio-8aef53522816fe7363060647ab9495aa27d75a1e.tar.gz mkinitcpio-8aef53522816fe7363060647ab9495aa27d75a1e.tar.xz | |
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.
| -rw-r--r-- | install/autodetect | 9 |
1 files changed, 3 insertions, 6 deletions
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}";; |