summaryrefslogtreecommitdiffstats
path: root/install/base
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-03-03 19:36:13 +0100
committerDave Reisner <dreisner@archlinux.org>2012-03-04 17:59:39 +0100
commit7b8e68af09e20fd95656b8909f4fc027440c1c30 (patch)
treea4b7d605767e46198c5ea470ee28c8bdbb4d032a /install/base
parent57e275a08d46f976ab2a2edf9b7b507bbca1d1ca (diff)
downloadmkinitcpio-7b8e68af09e20fd95656b8909f4fc027440c1c30.tar.gz
mkinitcpio-7b8e68af09e20fd95656b8909f4fc027440c1c30.tar.xz
add support for HOOKDIR/INSTDIR as arrays
This is a really ugly patch, but allows mkinitcpio to read hooks from multiple locations, namely: /usr/lib/initcpio/{install,hooks} /lib/initcpio/{install,hooks} Preference is given to the first, and all files included with mkinitcpio are moved there. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'install/base')
-rw-r--r--install/base8
1 files changed, 4 insertions, 4 deletions
diff --git a/install/base b/install/base
index 3b7632f..87c0b5d 100644
--- a/install/base
+++ b/install/base
@@ -9,9 +9,9 @@ build() {
add_symlink /bin usr/bin
add_symlink /usr/sbin bin
- add_binary /lib/initcpio/busybox /bin/busybox
+ add_binary /usr/lib/initcpio/busybox /bin/busybox
- for applet in $(/lib/initcpio/busybox --list); do
+ for applet in $(/usr/lib/initcpio/busybox --list); do
add_symlink "/usr/bin/$applet" busybox
done
@@ -31,8 +31,8 @@ build() {
# Add an empty fstab to avoid mount warning when -o remount is used
>"$BUILDROOT/etc/fstab"
- add_file "/lib/initcpio/init_functions" "/init_functions"
- add_file "/lib/initcpio/init" "/init"
+ add_file "/usr/lib/initcpio/init_functions" "/init_functions"
+ add_file "/usr/lib/initcpio/init" "/init"
add_file "/lib/modprobe.d/usb-load-ehci-first.conf"
# write a new config file. re-source the config as we can't guarantee the