Merge remote-tracking branch 'origin/merge-requests/235'

By Zig Globulin
* origin/merge-requests/235:
  wait for networkd online before curl invocation

See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/235
This commit is contained in:
nl6720 2023-05-13 16:22:24 +03:00
commit 798562bbfd
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 13 additions and 1 deletions

View File

@ -20,6 +20,9 @@ Deprecated
Fixed
-----
- Wait for ``network-online.target`` to become active before trying to download the script passed via the ``script=``
boot parameter.
Removed
-------

View File

@ -16,7 +16,13 @@ automated_script ()
script="$(script_cmdline)"
if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then
curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script >/dev/null
# there's no synchronization for network availability before executing this script
printf '%s: waiting for network-online.target\n' "$0"
until systemctl --quiet is-active network-online.target; do
sleep 1
done
printf '%s: downloading %s\n' "$0" "${script}"
curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script
rt=$?
else
cp "${script}" /tmp/startup_script
@ -24,6 +30,9 @@ automated_script ()
fi
if [[ ${rt} -eq 0 ]]; then
chmod +x /tmp/startup_script
printf '%s: executing automated script\n' "$0"
# note that script is executed when other services (like pacman-init) may be still in progress, please
# synchronize to "systemctl is-system-running --wait" when your script depends on other services
/tmp/startup_script
fi
fi