diff options
| author | maximilian attems <maks@debian.org> | 2010-06-16 22:33:33 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2010-06-17 11:28:14 +0200 |
| commit | 20313797a36d115827f1060cffe48255852a387f (patch) | |
| tree | 0f61727db912c33902a98ed1c2823d3ca8246366 | |
| parent | 38563fedd5e9058c9ec164031df300dd2c2d31ad (diff) | |
| download | initramfs-tools-20313797a36d115827f1060cffe48255852a387f.tar.gz initramfs-tools-20313797a36d115827f1060cffe48255852a387f.zip | |
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 <maks@debian.org>
| -rwxr-xr-x | mkinitramfs | 5 |
1 files 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" -- "$@"` |