diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-22 19:20:12 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-22 19:20:12 +0200 |
| commit | 1fc33f6afb36d28b83dedabeca41cf3358a1ee18 (patch) | |
| tree | 05c060d6f094a9d700d3b15cd0b43ea5524fb6e9 | |
| parent | 6caf65efee9de42337f042cb5ef452c67f88e8f0 (diff) | |
| download | vyos-live-build-1fc33f6afb36d28b83dedabeca41cf3358a1ee18.tar.gz vyos-live-build-1fc33f6afb36d28b83dedabeca41cf3358a1ee18.zip | |
Renaming local/scripts to local/bin for executables overriding not just lb scripts, but any command during live-build runs.
| -rwxr-xr-x | functions/common.sh | 2 | ||||
| -rwxr-xr-x | scripts/build/config | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/functions/common.sh b/functions/common.sh index 41fa13ec7..9284ec564 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -12,4 +12,4 @@ PROGRAM="live-build" VERSION="$(if [ -e ${LIVE_BUILD}/VERSION ]; then cat ${LIVE_BUILD}/VERSION; else cat /usr/share/live/build/VERSION; fi)" CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')" -PATH="${PWD}/local/scripts:${PATH}" +PATH="${PWD}/local/bin:${PATH}" diff --git a/scripts/build/config b/scripts/build/config index fcbe2084a..1b9671043 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1469,7 +1469,7 @@ LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}" EOF mkdir -p auto -mkdir -p local/scripts +mkdir -p local/bin # Checking defaults again Check_defaults |