diff options
| author | nl6720 <nl6720@gmail.com> | 2024-06-05 11:43:18 +0300 |
|---|---|---|
| committer | nl6720 <nl6720@gmail.com> | 2024-06-05 11:43:18 +0300 |
| commit | 57589df1d62ce90bda43d8e2927e66b7482cb184 (patch) | |
| tree | 2887b907d1a48758782a6fff9281388b4756c6ef | |
| parent | 4b709bcd5fc5e426ba75f72e1b80e59922d7c175 (diff) | |
| parent | 75e57093e617ce6f03b03168e54685cfff8e66d0 (diff) | |
| download | archiso-57589df1d62ce90bda43d8e2927e66b7482cb184.tar.gz archiso-57589df1d62ce90bda43d8e2927e66b7482cb184.tar.bz2 | |
Merge remote-tracking branch 'origin/merge-requests/386'
By Dariusz Pelowski
* origin/merge-requests/386:
.automated_script.sh: add proper HTTP status checking
See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/386
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rwxr-xr-x | configs/releng/airootfs/root/.automated_script.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 34337cb..b989057 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,8 @@ Deprecated Fixed ----- +- When downloading an automation script fail with non-zero status code instead of returning an HTML document when the remote HTTP server fails to deliver the document. + Removed ------- diff --git a/configs/releng/airootfs/root/.automated_script.sh b/configs/releng/airootfs/root/.automated_script.sh index 0d95012..f7f3ced 100755 --- a/configs/releng/airootfs/root/.automated_script.sh +++ b/configs/releng/airootfs/root/.automated_script.sh @@ -23,7 +23,7 @@ automated_script() { sleep 1 done printf '%s: downloading %s\n' "$0" "${script}" - curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script + curl "${script}" --location --retry-connrefused --retry 10 --fail -s -o /tmp/startup_script rt=$? else cp "${script}" /tmp/startup_script |