summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-04-16 14:34:58 +0200
committerDave Reisner <dreisner@archlinux.org>2012-04-16 14:35:34 +0200
commit9b17abfc946a1cdb348e0d31c883cef621fdcef5 (patch)
treed9f4234c6dbc7449d3f2a3a3639be6ac483a4b2d
parent67e9b3378e4956ff1db29586eede73bfd8bf5e8f (diff)
downloadmkinitcpio-9b17abfc946a1cdb348e0d31c883cef621fdcef5.tar.gz
mkinitcpio-9b17abfc946a1cdb348e0d31c883cef621fdcef5.tar.xz
mkinitcpio: refer to /usr/lib/modules uniformly
This should have been done as part of b65cf9cd9. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rwxr-xr-xmkinitcpio10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkinitcpio b/mkinitcpio
index a5199c8..bb85f7f 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -359,18 +359,18 @@ trap '(( ++builderrors ))' ERR
if (( ${#ADDED_MODULES[*]} )); then
printf '%s\0' "${MODPATHS[@]}" | sort -zu |
- xargs -0 cp -t "$BUILDROOT/lib/modules/$KERNELVERSION/kernel"
+ xargs -0 cp -t "$BUILDROOT/usr/lib/modules/$KERNELVERSION/kernel"
# unzip modules prior to recompression
- gzip -dr "$BUILDROOT/lib/modules/$KERNELVERSION/kernel"
+ gzip -dr "$BUILDROOT/usr/lib/modules/$KERNELVERSION/kernel"
msg "Generating module dependencies"
- install -m644 -t "$BUILDROOT/lib/modules/$KERNELVERSION" \
+ install -m644 -t "$BUILDROOT/usr/lib/modules/$KERNELVERSION" \
"$BASEDIR/lib/modules/$KERNELVERSION"/modules.{builtin,order}
- depmod -b "$BUILDROOT" "${KERNELVERSION}"
+ depmod -b "$BUILDROOT" "$KERNELVERSION"
# remove all non-binary module.* files (except devname for on-demand module loading)
- rm "$BUILDROOT/lib/modules/$KERNELVERSION"/modules.!(*.bin|devname)
+ rm "$BUILDROOT/usr/lib/modules/$KERNELVERSION"/modules.!(*.bin|devname)
else
warning "No modules were added to the image. This is probably not what you want."