From f139393dd20acd4856cf5ec019eb4b9d69b2cf52 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 8 Nov 2023 22:59:33 +0900
Subject: [PATCH] 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.
---
 network/80-6rd-tunnel.network      | 2 +-
 network/80-container-host0.network | 3 ++-
 network/80-container-vb.network    | 2 +-
 network/80-container-ve.network    | 2 +-
 network/80-container-vz.network    | 2 +-
 network/80-vm-vt.network           | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/network/80-6rd-tunnel.network b/network/80-6rd-tunnel.network
index fb163e7323f..5374ec5b073 100644
--- 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 30476674ecc..b79e701cac4 100644
--- 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 3a99ab87614..806f834e188 100644
--- 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 5e94041be60..076213adc66 100644
--- 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 a8b4d462a0f..7d570b2b32f 100644
--- 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 a58f753cfce..bb7942aa502 100644
--- 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.