diff options
| author | Thomas Bächler <thomas@archlinux.org> | 2010-07-05 21:47:57 +0200 |
|---|---|---|
| committer | Thomas Bächler <thomas@archlinux.org> | 2010-07-05 21:47:57 +0200 |
| commit | 392a05ef42b7fa99a21332c07f20ca2449524e3a (patch) | |
| tree | 4b73f0e80828d944cd3db8895da2529c7a778b69 /install/autodetect | |
| parent | 6d2ef0afddb8ab62ac5019e203fa85bb4a9f5165 (diff) | |
| parent | 94945a63162944f4bcf61f0012853f95191f0f91 (diff) | |
| download | mkinitcpio-392a05ef42b7fa99a21332c07f20ca2449524e3a.tar.gz mkinitcpio-392a05ef42b7fa99a21332c07f20ca2449524e3a.tar.xz | |
Merge branch 'btrfs' of http://github.com/heftig/mkinitcpio into working
Diffstat (limited to 'install/autodetect')
| -rw-r--r-- | install/autodetect | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/install/autodetect b/install/autodetect index 63e85c2..914a96b 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 @@ -46,19 +44,7 @@ install () fi for m in ${AUTODETECT}; do - modname="$(basename ${m%%\.ko})" - 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 + modname="$(basename ${m%.ko})" echo "${modname}" >> "${MODULE_FILE}" done |