summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorJan Steffens <jan.steffens@gmail.com>2010-06-15 17:00:54 +0200
committerJan Steffens <jan.steffens@gmail.com>2010-06-19 02:05:18 +0200
commita1c547e7e8e5c4a420a763451eb6af49b329af68 (patch)
treef89db8061ac33c1f37fbea66828708440bac3443 /install
parent8aef53522816fe7363060647ab9495aa27d75a1e (diff)
downloadmkinitcpio-a1c547e7e8e5c4a420a763451eb6af49b329af68.tar.gz
mkinitcpio-a1c547e7e8e5c4a420a763451eb6af49b329af68.tar.xz
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.
Diffstat (limited to 'install')
-rw-r--r--install/autodetect15
1 files changed, 2 insertions, 13 deletions
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