diff options
| author | Tom Gundersen <teg@jklm.no> | 2011-11-17 01:22:52 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2011-11-29 11:56:42 +0100 |
| commit | 5d8fc3c55ee1e766d3955882cbb10e795b541e5a (patch) | |
| tree | 4aee0587bf82585e18b82e66a8fd23e3795fa3a0 | |
| parent | dadb1d1a4ad7684dba5a3f16b6441081196dc5a3 (diff) | |
| download | mkinitcpio-5d8fc3c55ee1e766d3955882cbb10e795b541e5a.tar.gz mkinitcpio-5d8fc3c55ee1e766d3955882cbb10e795b541e5a.tar.xz | |
move all binaries to /usr/bin
Add compat symlinks from /bin, /sbin and /usr/sbin, so nothing is lost.
This will make sure that it is not possibly to install two different
versions of the same binary in PATH.
The main usecase of this is that we want to be able to override any
symlink provided by busybox by adding a binary by the same name. With
this patch we don't have to worry in case the busybox symlink and the
binary we add are in different directories; the last binary to be added
always takes precedence.
Signed-off-by: Tom Gundersen <teg@jklm.no>
| -rw-r--r-- | init | 5 | ||||
| -rw-r--r-- | install/base | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -1,6 +1,5 @@ -#!/bin/busybox ash -# Install busybox's applets as symlinks -PATH=/usr/sbin:/usr/bin:/sbin:/bin +#!/usr/bin/ash +PATH=/usr/bin /bin/busybox --install -s diff --git a/install/base b/install/base index 6c6f747..8232160 100644 --- a/install/base +++ b/install/base @@ -1,10 +1,14 @@ #!/bin/bash build() { - for dir in new_root proc sys dev run tmp usr/{bin,sbin}; do + for dir in new_root proc sys dev run tmp usr/bin; do add_dir "/$dir" done + add_symlink /sbin usr/bin + add_symlink /bin usr/bin + add_symlink /usr/sbin bin + add_binary /lib/initcpio/busybox /bin/busybox add_binary /sbin/modprobe add_binary /sbin/blkid |