From c9f281c079970a870cd8fc3a46957c36269f37b3 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 29 Nov 2019 17:47:05 +0100 Subject: [conf-tgz] use new variable name everywhere... --- builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 1516ed3e..27f5fd34 100755 --- a/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh +++ b/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh @@ -32,16 +32,16 @@ unpack_config_tgz() { logging.warn "Ignoring missing SLX_LOCAL_CONFIGURATION in '/etc/config.tgz'." else tarcopy \ - "${temporary_extract_directory}/openslx-configs/${SLX_LOCAL_CONFIGURATION}" \ - "${temporary_extract_directory}" + "${extract_dir}/openslx-configs/${SLX_LOCAL_CONFIGURATION}" \ + "${extract_dir}" fi fi # always purge openslx-configs/ - rm -rf "${temporary_extract_directory}/openslx-configs" + rm -rf "${extract_dir}/openslx-configs" # finally copy the rest into stage4 - if ! tarcopy "${temporary_extract_directory}" "$NEWROOT"; then - warn "'tarcopy' from '$temporary_extract_directory' to '$NEWROOT' failed." + if ! tarcopy "${extract_dir}" "$NEWROOT"; then + warn "'tarcopy' from '$extract_dir' to '$NEWROOT' failed." fi } -- cgit v1.2.3-55-g7522