From 20313797a36d115827f1060cffe48255852a387f Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Wed, 16 Jun 2010 22:33:33 +0200 Subject: mkinitramfs: No point in hardcoding busybox path should make merge for Ubuntu easier. Thanks to David Greaves in LP: #573282 for the idea. Signed-off-by: maximilian attems --- mkinitramfs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mkinitramfs b/mkinitramfs index e3b392e..9af5bfd 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -7,8 +7,9 @@ export PATH='/usr/bin:/sbin:/bin' keep="n" CONFDIR="/etc/initramfs-tools" verbose="n" -# BUSYBOXDIR="/usr/lib/initramfs-tools/bin/" -export BUSYBOXDIR="/bin" +test -e /bin/busybox && BUSYBOXDIR=/bin +test -e /usr/lib/initramfs-tools/bin/busybox && BUSYBOXDIR=/usr/lib/initramfs-tools/bin +export BUSYBOXDIR OPTIONS=`getopt -o c:d:ko:r:v -n "$0" -- "$@"` -- cgit v1.2.3