summaryrefslogtreecommitdiff
path: root/scripts/build/config
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/build/config')
-rwxr-xr-xscripts/build/config10
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/build/config b/scripts/build/config
index b563ee955..33429bb8d 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -872,6 +872,16 @@ then
_CONFIG=""
fi
+if [ -e .build/config ] && [ -n "${_CONFIG}" ]
+then
+ if [ "${1}" != "noauto" ]
+ then
+ Echo_message "Ignoring --config ${_CONFIG}: ${PWD} is already a live-build configuration tree"
+ fi
+
+ _CONFIG=""
+fi
+
if [ -n "${_CONFIG}" ]
then
if [ -e "${_CONFIG}" ] || [ -e "/usr/share/live/images/${_CONFIG}" ]