From ac6b6eb6c4a97e149b5969075d670b4505278319 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 12 Nov 2018 12:40:37 +0100 Subject: [dnbd3-rfs] minor formatting issues --- builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh index 04d2f27f..f8dcb17b 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh @@ -15,7 +15,7 @@ logging.set_log_file "$SLX_LOG_FILE_PATH" exceptions.deactivate configuration_file_name="$(getarg slx_configuration_filename=)" if [ -z "$configuration_file_name" ]; then - configuration_file_name='config' + configuration_file_name='config' fi slx_server="$(getarg slxsrv=)" slx_server_base="$(getarg slxbase=)" @@ -33,9 +33,9 @@ for TIMEOUT in 1 1 2 3; do done IFS="$IFS_backup" -if [[ ! -e "/etc/openslx" ]]; then - logging.warn "Downloading OpenSLX configuration file from any of the servers \"${slx_server}\" at location \"${slx_server_base}/${configuration_file_name}\" failed. Return code: $return_code" - exit 1 +if [[ ! -s "/etc/openslx.tmp" ]]; then + logging.warn "Downloading OpenSLX configuration file from any of the servers \"${slx_server}\" at location \"${slx_server_base}/${configuration_file_name}\" failed. Return code: $return_code" + return 1 fi # mark that the configuration variables came from remote -- cgit v1.2.3-55-g7522