faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
By John Lane
* origin/merge-requests/355:
  update changelog
  Allow download automated script using TFTP

See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/355
This commit is contained in:
nl6720 2023-12-08 11:09:38 +02:00
commit c96c2bef48
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@ -9,6 +9,7 @@ Added
----- -----
- Add bcachefs-tools to releng for access to bcachefs userspace tools. - Add bcachefs-tools to releng for access to bcachefs userspace tools.
- Add tftp as a valid protocol for downloading automated boot script.
Changed Changed
------- -------

2
configs/releng/airootfs/root/.automated_script.sh
View File

@ -16,7 +16,7 @@ automated_script() {
local script rt local script rt
script="$(script_cmdline)" script="$(script_cmdline)"
if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then if [[ "${script}" =~ ^((http|https|ftp|tftp)://) ]]; then
# there's no synchronization for network availability before executing this script # there's no synchronization for network availability before executing this script
printf '%s: waiting for network-online.target\n' "$0" printf '%s: waiting for network-online.target\n' "$0"
until systemctl --quiet is-active network-online.target; do until systemctl --quiet is-active network-online.target; do