summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-05-29 16:12:40 +0200
committerDave Reisner <dreisner@archlinux.org>2012-07-15 16:29:08 +0200
commit5f81d06e8b879e1778649405b314d60234934dfc (patch)
tree94a207718e239cde141b31c311fcceee625ca608 /install
parentc4fcc20e9446ed0715681c0d664feb7cb3af2bbb (diff)
downloadmkinitcpio-5f81d06e8b879e1778649405b314d60234934dfc.tar.gz
mkinitcpio-5f81d06e8b879e1778649405b314d60234934dfc.tar.xz
initalize buildroot later, and out outside of hooks
mkinitcpio needs to be able to more tightly control the layout of the image. By moving this outside the control of the base hook, it's more reasonable to believe that a drop-in replacement for the base hook could be written, as it now only contains the utilities required for the /init that it provides. Being that initialize_buildroot is outside of a hook, we can make "raw" calls to coreutils that create the directories and symlinks, saving some overhead and forking. This also symlinks /usr/local/{lib,bin} into the common /usr/lib and /usr/bin, respectively, so that there's always a way to override libs and bins, and they're automatically pulled into our strict early init path of /usr/bin. Finally, we lump all this generally a little "later" in the early setup. This addresses an unseen "bug" wherein an extra temp directory that never gets used is created when leveraging a preset. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'install')
-rw-r--r--install/base11
1 files changed, 1 insertions, 10 deletions
diff --git a/install/base b/install/base
index 30ad3fa..7bb23a8 100644
--- a/install/base
+++ b/install/base
@@ -1,16 +1,7 @@
#!/bin/bash
build() {
- local dir applet
-
- for dir in new_root proc sys dev run tmp usr/bin; do
- add_dir "/$dir"
- done
-
- add_symlink /lib usr/lib
- add_symlink /sbin usr/bin
- add_symlink /bin usr/bin
- add_symlink /usr/sbin bin
+ local applet
add_binary /usr/lib/initcpio/busybox /bin/busybox