summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2018-03-07 14:34:02 +0100
committerJonathan Bauer2018-03-07 14:34:02 +0100
commit5c764d73b513f929820a4431e8155d6e9faaf268 (patch)
tree5c09ee40b0e17c04eab21662acda31b9e119bd3b
parent[ib-conf] fix boot interface name (diff)
downloadsystemd-init-5c764d73b513f929820a4431e8155d6e9faaf268.tar.gz
systemd-init-5c764d73b513f929820a4431e8155d6e9faaf268.tar.xz
systemd-init-5c764d73b513f929820a4431e8155d6e9faaf268.zip
[conf-tgz] no exit in sourced script....
-rwxr-xr-xbuilder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh b/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh
index 083fbc6e..b411381e 100755
--- a/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh
+++ b/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh
@@ -34,11 +34,11 @@ exceptions.try
exceptions.activate
if [[ -z "$SLX_LOCAL_CONFIGURATION" ]]; then
logging.warn "SLX_LOCAL_CONFIGURATION is not set in '/etc/openslx'."
- exit 0
+ emergency_shell "error in ${BASH_SOURCE[0]}"
fi
if [[ ! -d "${temporary_extract_directory}/openslx-configs/${SLX_LOCAL_CONFIGURATION}" ]]; then
logging.warn "SLX_LOCAL_CONFIGURATION is set but no corresponding folder found in '/etc/config.tgz'."
- exit 0
+ emergency_shell "error in ${BASH_SOURCE[0]}"
fi
# still here? then process to merge the localized configuration files with the common files.
cd "${temporary_extract_directory}/openslx-configs/${SLX_LOCAL_CONFIGURATION}"