diff options
| author | Simon Rettberg | 2026-04-23 11:40:26 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2026-04-23 11:41:52 +0200 |
| commit | 141068cad8b06070bae816b44e8ef46c15de965a (patch) | |
| tree | 4ea6fdde3eed2105ad690869211a068e76eeb340 | |
| parent | Update to dracut-ng 110 (diff) | |
| download | systemd-init-141068cad8b06070bae816b44e8ef46c15de965a.tar.gz systemd-init-141068cad8b06070bae816b44e8ef46c15de965a.tar.xz systemd-init-141068cad8b06070bae816b44e8ef46c15de965a.zip | |
[config-tgz] Don't suppress error messages on download
| -rwxr-xr-x | modules.d/conf-tgz/hooks/s3-fetch-config-tgz.sh | 2 | ||||
| -rwxr-xr-x | modules.d/conf-tgz/hooks/s3-fetch-config.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules.d/conf-tgz/hooks/s3-fetch-config-tgz.sh b/modules.d/conf-tgz/hooks/s3-fetch-config-tgz.sh index 1d032a19..21b31f6a 100755 --- a/modules.d/conf-tgz/hooks/s3-fetch-config-tgz.sh +++ b/modules.d/conf-tgz/hooks/s3-fetch-config-tgz.sh @@ -17,7 +17,7 @@ if [ -s "/run/system-uuid" ]; then fi fi echo "Download config.tgz from '$conftgz_url'..." -slx-tools download_retry --slx-time 20 -sS "${conftgz_url}" > "/etc/config.tgz" +slx-tools download_retry --slx-time 20 -o "/etc/config.tgz" "${conftgz_url}" if ! [ -s "/etc/config.tgz" ]; then echo "Failed to download '${conftgz_url}'" diff --git a/modules.d/conf-tgz/hooks/s3-fetch-config.sh b/modules.d/conf-tgz/hooks/s3-fetch-config.sh index 67ee26c1..c5d5e1e4 100755 --- a/modules.d/conf-tgz/hooks/s3-fetch-config.sh +++ b/modules.d/conf-tgz/hooks/s3-fetch-config.sh @@ -10,7 +10,7 @@ slx_server_base="$(getarg slxbase=)" # if no slxsrv was specified, use the server the kernel was # downloaded from as fallback. Mostly for legacy PXE boot. if [ -z "$slx_server" ]; then - slx_server="$(getarg BOOT_IMAGE= | awk -F[/:] '{print $4}')" + slx_server="$(getarg BOOT_IMAGE= | awk -F"[/:]" '{print $4}')" fi if [ -z "$slx_server" ]; then # use tftp server from ip parameter @@ -35,7 +35,7 @@ fi config_path="/etc/openslx.tmp" echo "Downloading '$config_url'..." -slx-tools download_retry --slx-time 20 -sS "$config_url" > "$config_path" +slx-tools download_retry --slx-time 20 -o "$config_path" "$config_url" return_code="$?" sed -r 's/^([0-9]+)\.([0-9][0-9]).*$/\1\2/' /proc/uptime > /tmp/config-download-time |