summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-05-24 09:41:27 +0200
committerDaniel Baumann <daniel@debian.org>2012-05-24 09:41:27 +0200
commitcb3d6ca77f18aeb17cb72880ac599f2e850cd5a3 (patch)
tree37c43899d7ac4004ac43e57ec7c7acfbe75ae113
parent69194996f73fc04924dc3f1274ec8dd1b7c74701 (diff)
downloadvyos-live-build-cb3d6ca77f18aeb17cb72880ac599f2e850cd5a3.tar.gz
vyos-live-build-cb3d6ca77f18aeb17cb72880ac599f2e850cd5a3.zip
Allowing to inject variables through config/environment.chroot into the chroots environment.
-rwxr-xr-xfunctions/chroot.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh
index be801eb57..417462f3f 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -16,12 +16,19 @@ Chroot ()
# Executing commands in chroot
Echo_debug "Executing: %s" "${COMMANDS}"
+ if [ -e config/environment.chroot ]
+ then
+ ENV="$(cat config/environment.chroot)"
+ else
+ ENV=""
+ fi
+
if [ "${LB_USE_FAKEROOT}" != "true" ]
then
- ${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LB_APT_FTP_PROXY}" http_proxy="${LB_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
+ ${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LB_APT_FTP_PROXY}" http_proxy="${LB_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${ENV} ${COMMANDS}
else
# Building with fakeroot/fakechroot
- ${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" ${COMMANDS}
+ ${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" ${ENV} ${COMMANDS}
fi
return "${?}"