diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-03-03 19:36:13 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2012-03-04 17:59:39 +0100 |
| commit | 7b8e68af09e20fd95656b8909f4fc027440c1c30 (patch) | |
| tree | a4b7d605767e46198c5ea470ee28c8bdbb4d032a /install | |
| parent | 57e275a08d46f976ab2a2edf9b7b507bbca1d1ca (diff) | |
| download | mkinitcpio-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')
| -rw-r--r-- | install/base | 8 | ||||
| -rw-r--r-- | install/shutdown | 2 |
2 files changed, 5 insertions, 5 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 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() { |