network: use Kind= instead of Driver=

networkd ignores errors in reading driver through ethtool. The kind of
network interface is retrieved through netlink, and networkd checks
checks many failures. So, using Kind= should be safer.

No functional change, just for safety.

diff --git a/network/80-6rd-tunnel.network b/network/80-6rd-tunnel.network
index fb163e7323fa0af642c67d307224bc85b458b99d..5374ec5b073a18a913f1b163c85801ab9bd930ad 100644 (file)
--- a/network/80-6rd-tunnel.network
+++ b/network/80-6rd-tunnel.network
@@ -15,8 +15,8 @@
 # systemd-networkd when DHCPv4 6RD option is received.
 
 [Match]
+Kind=sit
 Name=6rd-*
-Type=sit
 
 [Network]
 DHCPPrefixDelegation=yes

diff --git a/network/80-container-host0.network b/network/80-container-host0.network
index 30476674eccdc7ffe1228bd9895607b3b195b507..b79e701cac4c9a3f770f56805af2068aa419351c 100644 (file)
--- a/network/80-container-host0.network
+++ b/network/80-container-host0.network
@@ -16,8 +16,9 @@
 # details.
 
 [Match]
-Virtualization=container
+Kind=veth
 Name=host0
+Virtualization=container
 
 [Network]
 DHCP=yes

diff --git a/network/80-container-vb.network b/network/80-container-vb.network
index 3a99ab87614394cfe53d60ab185934e3ca862f22..806f834e18834d7d1f50f66d78a4b0072092574a 100644 (file)
--- a/network/80-container-vb.network
+++ b/network/80-container-vb.network
@@ -16,8 +16,8 @@
 # --network-zone switch. See systemd-nspawn(1) for details.
 
 [Match]
+Kind=veth
 Name=vb-*
-Driver=veth
 
 [Network]
 KeepMaster=yes

diff --git a/network/80-container-ve.network b/network/80-container-ve.network
index 5e94041be609c2031d57b907c37be97d2d89131d..076213adc66668880898dc69d25fbf4b0c6b7a25 100644 (file)
--- a/network/80-container-ve.network
+++ b/network/80-container-ve.network
@@ -16,8 +16,8 @@
 # details.
 
 [Match]
+Kind=veth
 Name=ve-*
-Driver=veth
 
 [Network]
 # Default to using a /28 prefix, giving up to 13 addresses per container.

diff --git a/network/80-container-vz.network b/network/80-container-vz.network
index a8b4d462a0f8f7cfba8a1adb20af74871b5a1fca..7d570b2b32f3aabbe8b9c76d9a929a46b4358ee6 100644 (file)
--- a/network/80-container-vz.network
+++ b/network/80-container-vz.network
@@ -15,8 +15,8 @@
 # --network-zone= switch. See systemd-nspawn(1) for details.
 
 [Match]
+Kind=bridge
 Name=vz-*
-Driver=bridge
 
 [Network]
 # Default to using a /24 prefix, giving up to 253 addresses per virtual network.

diff --git a/network/80-vm-vt.network b/network/80-vm-vt.network
index a58f753cfcea3b0441ab5ef13433bff173049296..bb7942aa5023d2b11da6c2aa8a3dde93fb36124e 100644 (file)
--- a/network/80-vm-vt.network
+++ b/network/80-vm-vt.network
@@ -15,8 +15,8 @@
 # configuration as ve-* to provide NAT/DHCP to VMs.
 
 [Match]
+Kind=tun
 Name=vt-*
-Driver=tun
 
 [Network]
 # Default to using a /28 prefix, giving up to 13 addresses per VM.