diff options
| -rwxr-xr-x | functions/chroot.sh | 15 | ||||
| -rwxr-xr-x | scripts/build/lb | 15 |
2 files changed, 18 insertions, 12 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh index 4d1d9890c..954b5977d 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -16,12 +16,15 @@ Chroot () # Executing commands in chroot Echo_debug "Executing: %s" "${COMMANDS}" - if [ -e config/environment.chroot ] - then - ENV="$(grep -v '^#' config/environment.chroot)" - else - ENV="" - fi + ENV="" + + for _FILE in config/environment config/environment.chroot + do + if [ -e "${_FILE}" ] + then + ENV="${ENV} $(grep -v '^#' ${_FILE})" + fi + done if [ "${LB_USE_FAKEROOT}" != "true" ] then diff --git a/scripts/build/lb b/scripts/build/lb index 7f2156b15..d33ea69dc 100755 --- a/scripts/build/lb +++ b/scripts/build/lb @@ -42,12 +42,15 @@ case "${1}" in COMMAND="lb_${1}" shift - if [ -e config/environment.binary ] - then - ENV="$(grep -v '^#' config/environment.binary)" - else - ENV="" - fi + ENV="" + + for _FILE in config/environment config/environment.binary + do + if [ -e "${_FILE}" ] + then + ENV="${ENV} $(grep -v '^#' ${_FILE})" + fi + done if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ] then |