diff options
| author | David P <megver83@parabola.nu> | 2021-08-02 17:59:43 -0400 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2021-08-02 17:59:43 -0400 |
| commit | e09959ed0aba19e6b7f6789c1c57632414c5ec4b (patch) | |
| tree | eccdafaef03b09dc7f9c039a8257bfdc3cab30a6 /configs/releng/airootfs/etc/systemd/network | |
| parent | f8233e405bc7851dc6f81c316b1100484421ffb2 (diff) | |
sync with archiso v57
archiso:
a4691b8 (tag: v57) Merge branch 'changelog/57'
12c21b1 (origin/changelog/57) Add changelog for 57
0ccb4f8 Merge branch 'issues/143'
0fa1c0e (origin/issues/143) mkarchiso: Do not run _build_iso_base once
9462e4c Merge branch 'issues/117'
f4324e2 (origin/issues/117) Remove SPDX license identifier from releng configs
00a1e8e Remove SPDX license identifier from releng configs
a07ff5c Merge remote-tracking branch 'nl6720/bootmodes-2'
610ff2a mkarchiso: improve functions and comments
1cec901 Merge remote-tracking branch 'nl6720/RouteMetric'
8fa110e configs/*/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf: document why the drop-in file exists
c6a1ccc configs/releng/airootfs/etc/systemd/network/: move RouteMetric= from [DHCPv6] to [IPv6AcceptRA]
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/releng/airootfs/etc/systemd/network')
4 files changed, 23 insertions, 32 deletions
diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index dd0193d..0ac5028 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Match] Type=en* Type=eth* @@ -9,8 +6,13 @@ Type=eth* DHCP=yes IPv6PrivacyExtensions=yes +# systemd-networkd does not set per-interface-type default route metrics +# https://github.com/systemd/systemd/issues/17698 +# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband. +# 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=512 +RouteMetric=100 -[DHCPv6] -RouteMetric=512 +[IPv6AcceptRA] +RouteMetric=100 diff --git a/configs/releng/airootfs/etc/systemd/network/20-wireless.network b/configs/releng/airootfs/etc/systemd/network/20-wireless.network deleted file mode 100644 index 73a6bbd..0000000 --- a/configs/releng/airootfs/etc/systemd/network/20-wireless.network +++ /dev/null @@ -1,15 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -[Match] -Type=wlan - -[Network] -DHCP=yes -IPv6PrivacyExtensions=yes - -[DHCPv4] -RouteMetric=1024 - -[DHCPv6] -RouteMetric=1024 diff --git a/configs/releng/airootfs/etc/systemd/network/20-wlan.network b/configs/releng/airootfs/etc/systemd/network/20-wlan.network index c164666..601d5b8 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wlan.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wlan.network @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Match] Name=wl* @@ -8,8 +5,13 @@ Name=wl* DHCP=yes IPv6PrivacyExtensions=yes +# systemd-networkd does not set per-interface-type default route metrics +# https://github.com/systemd/systemd/issues/17698 +# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband. +# 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=1024 +RouteMetric=600 -[DHCPv6] -RouteMetric=1024 +[IPv6AcceptRA] +RouteMetric=600 diff --git a/configs/releng/airootfs/etc/systemd/network/20-wwan.network b/configs/releng/airootfs/etc/systemd/network/20-wwan.network index ff5ad66..55dadc2 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wwan.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wwan.network @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Match] Type=ww* @@ -8,8 +5,13 @@ Type=ww* DHCP=yes IPv6PrivacyExtensions=yes +# systemd-networkd does not set per-interface-type default route metrics +# https://github.com/systemd/systemd/issues/17698 +# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband. +# 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 -[DHCPv6] -RouteMetric=2048 +[IPv6AcceptRA] +RouteMetric=700 |