diff options
-rw-r--r-- | CHANGELOG.rst | 20 | ||||
-rw-r--r-- | configs/baseline/airootfs/etc/systemd/network/20-ethernet.network | 3 | ||||
-rw-r--r-- | configs/releng/airootfs/etc/systemd/network/20-ethernet.network | 3 | ||||
-rw-r--r-- | configs/releng/airootfs/etc/systemd/network/20-wlan.network | 4 | ||||
-rw-r--r-- | configs/releng/airootfs/etc/systemd/network/20-wwan.network | 7 | ||||
-rwxr-xr-x | configs/releng/airootfs/root/.automated_script.sh | 2 | ||||
-rw-r--r-- | configs/releng/packages.both | 1 |
7 files changed, 37 insertions, 3 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d7ab36a..b2f9dc3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -20,6 +20,26 @@ Fixed Removed ------- +[74] - 2023-12-21 +================= + +Added +----- + +- Add bcachefs-tools to releng for access to bcachefs userspace tools. +- Add tftp as a valid protocol for downloading automated boot script. + +Changed +------- + +- Set ``RequiredForOnline=routable`` in systemd-networkd configuration files to improve the chances that the network + really is *online* when ``network-online.target`` is reached. + +Fixed +----- + +- Add missing replacement for the UUID variable in systemd-boot configuration files on ISO 9660. + [73] - 2023-09-29 ================= diff --git a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network index 177e0aa..0e4287b 100644 --- a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network @@ -5,6 +5,9 @@ Name=en* Name=eth* +[Link] +RequiredForOnline=routable + [Network] DHCP=yes MulticastDNS=yes diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index 4b0f9b3..d3a3271 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -5,6 +5,9 @@ Name=en* Name=eth* +[Link] +RequiredForOnline=routable + [Network] DHCP=yes MulticastDNS=yes diff --git a/configs/releng/airootfs/etc/systemd/network/20-wlan.network b/configs/releng/airootfs/etc/systemd/network/20-wlan.network index b8216fd..8b70a95 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wlan.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wlan.network @@ -1,8 +1,12 @@ [Match] Name=wl* +[Link] +RequiredForOnline=routable + [Network] DHCP=yes +MulticastDNS=yes # systemd-networkd does not set per-interface-type default route metrics # https://github.com/systemd/systemd/issues/17698 diff --git a/configs/releng/airootfs/etc/systemd/network/20-wwan.network b/configs/releng/airootfs/etc/systemd/network/20-wwan.network index 9d19945..6e1c8dd 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wwan.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wwan.network @@ -1,5 +1,8 @@ [Match] -Type=ww* +Name=ww* + +[Link] +RequiredForOnline=routable [Network] DHCP=yes @@ -10,7 +13,7 @@ DHCP=yes # Use values from NetworkManager. From nm_device_get_route_metric_default in # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c [DHCPv4] -RouteMetric=2048 +RouteMetric=700 [IPv6AcceptRA] RouteMetric=700 diff --git a/configs/releng/airootfs/root/.automated_script.sh b/configs/releng/airootfs/root/.automated_script.sh index 8e72bf7..0d95012 100755 --- a/configs/releng/airootfs/root/.automated_script.sh +++ b/configs/releng/airootfs/root/.automated_script.sh @@ -16,7 +16,7 @@ automated_script() { local script rt script="$(script_cmdline)" 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 printf '%s: waiting for network-online.target\n' "$0" until systemctl --quiet is-active network-online.target; do diff --git a/configs/releng/packages.both b/configs/releng/packages.both index 4a48c77..9828871 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -1,6 +1,7 @@ alsa-utils arch-install-scripts base +bcachefs-tools bind bolt brltty |