Adding support for live-images configs and arbitrary configuration directories in lb_config --config option.
This commit is contained in:
parent
1f07481fbc
commit
3f19c0c357
|
@ -874,6 +874,16 @@ fi
|
|||
|
||||
if [ -n "${_CONFIG}" ]
|
||||
then
|
||||
if [ -e "${_CONFIG}" ] || [ -e "/usr/share/live/images/${_CONFIG}" ]
|
||||
then
|
||||
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}"
|
||||
|
@ -886,6 +896,7 @@ then
|
|||
Echo_message "Checking out ${_GIT_BRANCH}"
|
||||
git checkout ${_GIT_BRANCH}
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -e auto/config ]
|
||||
then
|
||||
|
|
Loading…
Reference in New Issue