diff options
Diffstat (limited to 'builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh')
| -rwxr-xr-x | builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh b/builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh index 079d45be..1c8ace61 100755 --- a/builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh +++ b/builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh @@ -1,19 +1,11 @@ #!/usr/bin/env bash # -*- coding: utf-8 -*- -source '/usr/lib/rebash/core.sh' -core.import exceptions -core.import logging type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh -exceptions.try -{ - # NOTE: "getarg" raises an exception so deactivate exceptions for now. - exceptions.deactivate slx_server="$(getarg slxsrv=)" slx_server_base="$(getarg slxbase=)" - exceptions.activate if [ -z "$SLX_NO_CONFIG_TGZ" ]; then # build config.tgz url @@ -26,18 +18,12 @@ exceptions.try conftgz_url="${conftgz_url}?uuid=${uuid}" fi fi - logging.info "Download config.tgz from '$conftgz_url'..." + info "Download config.tgz from '$conftgz_url'..." slx-tools download_retry -s "${conftgz_url}" > "/etc/config.tgz" if [[ ! -s "/etc/config.tgz" ]]; then - logging.warn \ + warn \ "Downloading 'config.tgz' from '${slx_server}' failed with: $return_code" - return 1 + # TODO handle error fi fi -} -exceptions.catch -{ - logging.error "$exceptions_last_traceback" - emergency_shell "error in ${BASH_SOURCE[0]}" -} |