summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2023-11-08 14:59:33 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2023-11-08 14:59:57 +0100
commitf139393dd20acd4856cf5ec019eb4b9d69b2cf52 (patch)
tree50942da86abddb0a36a4c45af3cd823910388ced /network
parentresolvectl: do not sort domain output (diff)
downloadsystemd-f139393dd20acd4856cf5ec019eb4b9d69b2cf52.tar.xz
systemd-f139393dd20acd4856cf5ec019eb4b9d69b2cf52.zip
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.
Diffstat (limited to 'network')
-rw-r--r--network/80-6rd-tunnel.network2
-rw-r--r--network/80-container-host0.network3
-rw-r--r--network/80-container-vb.network2
-rw-r--r--network/80-container-ve.network2
-rw-r--r--network/80-container-vz.network2
-rw-r--r--network/80-vm-vt.network2
6 files changed, 7 insertions, 6 deletions
diff --git a/network/80-6rd-tunnel.network b/network/80-6rd-tunnel.network
index fb163e7323..5374ec5b07 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 30476674ec..b79e701cac 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 3a99ab8761..806f834e18 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 5e94041be6..076213adc6 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 a8b4d462a0..7d570b2b32 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 a58f753cfc..bb7942aa50 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.