summaryrefslogtreecommitdiffstats
path: root/install/autodetect
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-09-22 00:47:53 +0200
committerDave Reisner <dreisner@archlinux.org>2013-09-24 17:12:20 +0200
commit59c79bda956ccb309d21adfb5afcc19df77a8e0b (patch)
tree8816266cbeeb6cd64fc4c380edefe01518f69bef /install/autodetect
parentc1e8eb0e130a1f8e9dd8253478a0a626b4f441cc (diff)
downloadmkinitcpio-59c79bda956ccb309d21adfb5afcc19df77a8e0b.tar.gz
mkinitcpio-59c79bda956ccb309d21adfb5afcc19df77a8e0b.tar.xz
autodetect: read modaliases from uevent files
As suggested by Harald Hoyer, this is more accurate for the sake of following where udev gets its modaliases from. In some rare cases, it may even be more complete than scraping the raw modalias files. Also, introduce a wrapper around modprobe so that the options passed are never ommitted, or wrongly specified. In this case, a subtle bug with the -r flag is fixed due to using the wrong variable with modprobe's -d flag. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'install/autodetect')
-rw-r--r--install/autodetect3
1 files changed, 1 insertions, 2 deletions
diff --git a/install/autodetect b/install/autodetect
index b3db536..37af3be 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -10,8 +10,7 @@ build() {
# treat this as an alias, since ext3 might be aliased to ext4. also, as
# of linux 3.9, we can find any filesystem by the alias "fs-$name"
# rather than having to guess at the corresponding module name.
- IFS=$'\n' read -rd '' -a resolved < \
- <(modprobe -d "$_optmoduleroot" -S "$KERNELVERSION" -Ra {fs-,}"$1" 2>/dev/null)
+ mapfile -t resolved < <(modprobe -Ra {fs-,}"$1" 2>/dev/null)
for r in "${resolved[@]}"; do
_autodetect_cache["$r"]=1