From 1b12e4550f98f1c38fa18d07ea6c3816dc5843ab Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 16 Feb 2021 15:48:40 +0100 Subject: [conf-tgz] use $config_tgz everywhere --- modules.d/conf-tgz/hooks/unpack-config-tgz.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/conf-tgz/hooks/unpack-config-tgz.sh b/modules.d/conf-tgz/hooks/unpack-config-tgz.sh index 71b3ca1e..ec31b8f5 100755 --- a/modules.d/conf-tgz/hooks/unpack-config-tgz.sh +++ b/modules.d/conf-tgz/hooks/unpack-config-tgz.sh @@ -19,7 +19,7 @@ unpack_config_tgz() { [ -e "$config_tgz" ] || return 1 local extract_dir="$(mktemp -d)" tar --extract --preserve-permissions \ - --file="/etc/config.tgz" \ + --file="$config_tgz" \ --directory="$extract_dir" if [ "$?" -ne 0 ]; then warn "Failed to extract '$config_tgz' to '$extract_dir'." @@ -29,7 +29,7 @@ unpack_config_tgz() { source "/etc/openslx" if [ -n "$SLX_LOCAL_CONFIGURATION" ]; then if [ ! -d "${extract_dir}/openslx-configs/${SLX_LOCAL_CONFIGURATION}" ]; then - warn "Ignoring missing SLX_LOCAL_CONFIGURATION in '/etc/config.tgz'." + warn "Ignoring missing SLX_LOCAL_CONFIGURATION in '$config_tgz'." else tarcopy \ "${extract_dir}/openslx-configs/${SLX_LOCAL_CONFIGURATION}" \ -- cgit v1.2.3-55-g7522