diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-06-06 21:32:08 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-06 21:32:08 +0200 |
| commit | 87374242c6517a898943bdea378108238c4c98ee (patch) | |
| tree | 3169c73f0b0d0bc0cffcdb75d386555ab48c0710 /scripts | |
| parent | 0451545abb83602aef13fe4df2a2ea690c77d32f (diff) | |
| download | vyos-live-build-87374242c6517a898943bdea378108238c4c98ee.tar.gz vyos-live-build-87374242c6517a898943bdea378108238c4c98ee.zip | |
For consistency, respecting config/environment too for both chroot and binary environments (but the content of sepcific environments for either chroot or binary still has precedence over the generic one).
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/lb | 15 |
1 files changed, 9 insertions, 6 deletions
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 |