From 7b8e68af09e20fd95656b8909f4fc027440c1c30 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 3 Mar 2012 13:36:13 -0500 Subject: 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 --- install/base | 8 ++++---- install/shutdown | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'install') 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 diff --git a/install/shutdown b/install/shutdown index 7c6b7bc..5b56f17 100644 --- a/install/shutdown +++ b/install/shutdown @@ -4,7 +4,7 @@ build() { BINARIES='cp' SCRIPT='shutdown' - add_file "/lib/initcpio/shutdown" "/shutdown" + add_file "/usr/lib/initcpio/shutdown" "/shutdown" } help() { -- cgit v1.2.3-24-g4f1b