diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-13 18:51:54 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:02 +0200 |
| commit | 5beadcd563cf921e287a8ef4941896576b6a7aa3 (patch) | |
| tree | ad7b3a7b16a42c1f5f1a88e70622abb473affe6e /scripts/build | |
| parent | cfc54e140380ed4a44713d78575c837b48465bc4 (diff) | |
| download | vyos-live-build-5beadcd563cf921e287a8ef4941896576b6a7aa3.tar.gz vyos-live-build-5beadcd563cf921e287a8ef4941896576b6a7aa3.zip | |
Adding support for live-images configs and arbitrary configuration directories in lb_config --config option.
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/config | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/scripts/build/config b/scripts/build/config index f3b575441..b563ee955 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -874,17 +874,28 @@ fi if [ -n "${_CONFIG}" ] then - _GIT_REPOSITORY="$(echo ${_CONFIG} | sed -e 's|::.*$||')" - - Echo_message "Cloning ${_GIT_REPOSITORY}" - git clone ${_GIT_REPOSITORY} ./ - - if [ "${_GIT_REPOSITORY}" != "${_CONFIG}" ] + if [ -e "${_CONFIG}" ] || [ -e "/usr/share/live/images/${_CONFIG}" ] then - _GIT_BRANCH="$(echo ${_CONFIG} | awk -F\:\: '{ print $NF }')" - - Echo_message "Checking out ${_GIT_BRANCH}" - git checkout ${_GIT_BRANCH} + if [ ! -e "${_CONFIG}" ] && [ -e "/usr/share/live/images/${_CONFIG}" ] + then + _CONFIG="/usr/share/live/images/${_CONFIG}" + fi + + Echo_message "Copying ${_CONFIG}" + tar -C "${_CONFIG}" -c . | tar -C ./ -x + else + _GIT_REPOSITORY="$(echo ${_CONFIG} | sed -e 's|::.*$||')" + + Echo_message "Cloning ${_GIT_REPOSITORY}" + git clone ${_GIT_REPOSITORY} ./ + + if [ "${_GIT_REPOSITORY}" != "${_CONFIG}" ] + then + _GIT_BRANCH="$(echo ${_CONFIG} | awk -F\:\: '{ print $NF }')" + + Echo_message "Checking out ${_GIT_BRANCH}" + git checkout ${_GIT_BRANCH} + fi fi if [ -e auto/config ] |