diff options
| author | Jonathan Bauer | 2020-01-16 16:39:56 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2020-01-16 16:39:56 +0100 |
| commit | 109f6a9d0511ba92b6cdb6edd37cacf30dfde9d7 (patch) | |
| tree | 439512d41294e00b535c63d5487ee21f932156a8 /builder/modules.d/dnbd3-rootfs/hooks | |
| parent | [dnbd3-rootfs] fallback for missing slxsrv in kcl (diff) | |
| download | systemd-init-109f6a9d0511ba92b6cdb6edd37cacf30dfde9d7.tar.gz systemd-init-109f6a9d0511ba92b6cdb6edd37cacf30dfde9d7.tar.xz systemd-init-109f6a9d0511ba92b6cdb6edd37cacf30dfde9d7.zip | |
[*] fix fallback when no slxsrv is in kcl
Diffstat (limited to 'builder/modules.d/dnbd3-rootfs/hooks')
| -rwxr-xr-x | builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh index 2b63f917..60e3bde9 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh @@ -15,7 +15,6 @@ logging.set_log_file "${SLX_LOG_FILE_PATH:-/var/log/openslx}" exceptions.deactivate slx_server="$(getarg slxsrv=)" slx_server_base="$(getarg slxbase=)" -exceptions.activate # if no slxsrv was specified, use the server the kernel was # downloaded from as fallback. Mostly for legacy PXE boot. @@ -31,6 +30,8 @@ if [ -z "$slx_server" ]; then emergency_shell "Failed to determine SLX server to fetch config from." fi +exceptions.activate + # build config_url config_url="http://${slx_server#@}/${slx_server_base}/config" |