diff options
| author | maximilian attems <maks@debian.org> | 2009-07-29 16:57:15 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2009-07-29 16:58:31 +0200 |
| commit | eea7e5df69e993feeb39e664105016b89e0e09e6 (patch) | |
| tree | 3ac6c5254e8c3637eddf52e320c1fe4d277e1783 /mkinitramfs | |
| parent | a71705c44cc48a31ad57443dbbdb1fdf8815f9fb (diff) | |
| download | initramfs-tools-eea7e5df69e993feeb39e664105016b89e0e09e6.tar.gz initramfs-tools-eea7e5df69e993feeb39e664105016b89e0e09e6.zip | |
move busybox addition to a hook script
thus export the 2 needed busybox variables,
be sure to have the klibc shell for now around.
Signed-off-by: maximilian attems <maks@debian.org>
Diffstat (limited to 'mkinitramfs')
| -rwxr-xr-x | mkinitramfs | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/mkinitramfs b/mkinitramfs index 11f44f8..f4f122c 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -9,7 +9,7 @@ CONFDIR="/etc/initramfs-tools" verbose="n" errors_to="2>/dev/null" # BUSYBOXDIR="/usr/lib/initramfs-tools/bin/" -BUSYBOXDIR="/bin" +export BUSYBOXDIR="/bin" OPTIONS=`getopt -o d:ko:r:v -n "$0" -- "$@"` @@ -153,6 +153,7 @@ export DPKG_ARCH export verbose export KEYMAP export MODULES +export BUSYBOX # Private, used by 'catenate_cpiogz'. export __TMPCPIOGZ @@ -231,21 +232,6 @@ if [ -n "${ROOT}" ]; then echo "ROOT=${ROOT}" > ${DESTDIR}/conf/conf.d/root fi -# Busybox -if [ "${BUSYBOX}" = "n" ] || [ ! -e ${BUSYBOXDIR}/busybox ]; then - mv ${DESTDIR}/bin/sh.shared ${DESTDIR}/bin/sh - # those root need busybox - eval "$(mount | awk '/ \/ / {print "r_dev=" $1; exit}')" - if [ "${r_dev#/dev/mapper/}" != "${r_dev}" ]; then - echo "Warning: Busybox is required for successful boot!" - fi -else - rm -f ${DESTDIR}/bin/sh - rm -f ${DESTDIR}/bin/busybox - copy_exec ${BUSYBOXDIR}/busybox /bin/busybox - ln -s ${BUSYBOXDIR}/busybox ${DESTDIR}/bin/sh -fi - # Modutils copy_exec /sbin/modprobe /sbin copy_exec /sbin/depmod /sbin |