summaryrefslogtreecommitdiffstats
path: root/install/autodetect
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2010-02-11 19:31:31 +0100
committerThomas Bächler <thomas@archlinux.org>2010-02-11 19:31:31 +0100
commit0d755f3b5f96e9cf229c523cebcfb8c2379c1fd2 (patch)
tree31768b40897ce1d9ac3c2b22c1d8fcc89b6ecd23 /install/autodetect
parent1a91e4fa8e2d9823082843e98021c3345f82f072 (diff)
parentd67250f427937cb4b6f75b27d47d35302bd9890b (diff)
downloadmkinitcpio-0d755f3b5f96e9cf229c523cebcfb8c2379c1fd2.tar.gz
mkinitcpio-0d755f3b5f96e9cf229c523cebcfb8c2379c1fd2.tar.xz
Merge branch 'kill-klibc'
Conflicts: Makefile
Diffstat (limited to 'install/autodetect')
-rw-r--r--install/autodetect11
1 files changed, 7 insertions, 4 deletions
diff --git a/install/autodetect b/install/autodetect
index 0010da3..6c9193c 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -20,10 +20,13 @@ install ()
if [ ${UID} -eq 0 -o "$(groups | grep disk)" != "" ]; then
for fs in $(findfs | sort | uniq); do
- for mod in $(find "${MODULEDIR}" -type f -name "${fs}.ko"); do
- if [ -n "${mod}" ]; then
- AUTODETECT="${AUTODETECT} ${mod}"
- fi
+ allfs="${fs} $(modprobe --set-version ${KERNELVERSION} --resolve-alias ${fs})"
+ for mod in ${allfs}; do
+ for modfile in $(find "${MODULEDIR}" -type f -name "${mod}.ko"); do
+ if [ -n "${modfile}" ]; then
+ AUTODETECT="${AUTODETECT} ${modfile}"
+ fi
+ done
done
done