From f6f4e808d1b36a0e8b69f70f4e29a81f3ffe193d Mon Sep 17 00:00:00 2001
From: Jan Provaznik <jprovazn@redhat.com>
Date: Mon, 11 Nov 2013 14:26:18 +0100
Subject: [PATCH] Remove BUSYBOX variable from ramdisk-defaults
ramdisk-defaults file is sourced before chroot to an image being created
is executed. Busybox path should be set inside chroot instead.
Change-Id: Ic0e1d3093ca9d489dd96b14157e93b336cf0baee
---
elements/ramdisk/post-install.d/99-build-ramdisk | 1 +
lib/ramdisk-defaults | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/elements/ramdisk/post-install.d/99-build-ramdisk b/elements/ramdisk/post-install.d/99-build-ramdisk
index c5fdb9f60..3aabf7cbc 100755
--- a/elements/ramdisk/post-install.d/99-build-ramdisk
+++ b/elements/ramdisk/post-install.d/99-build-ramdisk
@@ -19,6 +19,7 @@ FIRMWARE_DIR=$MODULE_ROOT/lib/firmware
LIB_UDEV=$LIB_UDEV_ROOT/lib/udev
INIT="$_LIB/scripts/init"
FUNCTIONS_D="$_LIB/scripts/d"
+BUSYBOX=${BUSYBOX:-$(which busybox)}
mk_build_dir
mkdir -p $TMP_BUILD_DIR/mnt
diff --git a/lib/ramdisk-defaults b/lib/ramdisk-defaults
index 0f5b9ad50..893826b13 100644
--- a/lib/ramdisk-defaults
+++ b/lib/ramdisk-defaults
@@ -21,4 +21,3 @@ export DIB_MIN_TMPFS=${DIB_MIN_TMPFS:-1}
source $_LIB/common-defaults
MODULE_ROOT=${DIB_MODULE_ROOT:-""}
LIB_UDEV_ROOT=${DIB_LIB_UDEV_ROOT:-""}
-BUSYBOX=${BUSYBOX:-$(which busybox)}