Update configs/releng/airootfs/etc/systemd/network/20-{ethernet,wireless}.network

* Match the device type instead of the interface name.
* Replace DHCP section with DHCPv4/DHCPv6. systemd split the sections.

2 files changed, 10 insertions, 6 deletions

diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network
index efa309c..4fce10c 100644
--- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network
+++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network
@@ -2,12 +2,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 [Match]
-Name=en*
-Name=eth*
+Type=ether
 
 [Network]
 DHCP=yes
 IPv6PrivacyExtensions=yes
 
-[DHCP]
+[DHCPv4]
+RouteMetric=512
+
+[DHCPv6]
 RouteMetric=512
diff --git a/configs/releng/airootfs/etc/systemd/network/20-wireless.network b/configs/releng/airootfs/etc/systemd/network/20-wireless.network
index bf9ab9d..73a6bbd 100644
--- a/configs/releng/airootfs/etc/systemd/network/20-wireless.network
+++ b/configs/releng/airootfs/etc/systemd/network/20-wireless.network
@@ -2,12 +2,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 [Match]
-Name=wlp*
-Name=wlan*
+Type=wlan
 
 [Network]
 DHCP=yes
 IPv6PrivacyExtensions=yes
 
-[DHCP]
+[DHCPv4]
+RouteMetric=1024
+
+[DHCPv6]
 RouteMetric=1024