diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-11-08 21:15:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-08 21:15:13 +0100 |
| commit | 425e8065b7c13f84105d049045c66ce652cacf80 (patch) | |
| tree | a3159d61b26b5a2a081cacdb4d8da23d528c0d7f | |
| parent | journalctl: verify sealed log epochs are continuous (diff) | |
| parent | network: make 89-ethernet.network match only physical interfaces (diff) | |
| download | systemd-425e8065b7c13f84105d049045c66ce652cacf80.tar.xz systemd-425e8065b7c13f84105d049045c66ce652cacf80.zip | |
Merge pull request #29932 from yuwata/default-network-cleanups
network: several cleanups for default .network files
| -rw-r--r-- | network/80-6rd-tunnel.network | 2 | ||||
| -rw-r--r-- | network/80-container-host0.network | 3 | ||||
| -rw-r--r-- | network/80-container-vb.network | 2 | ||||
| -rw-r--r-- | network/80-container-ve.network | 2 | ||||
| -rw-r--r-- | network/80-container-vz.network | 2 | ||||
| -rw-r--r-- | network/80-vm-vt.network | 2 | ||||
| -rw-r--r-- | network/89-ethernet.network.example | 3 |
7 files changed, 9 insertions, 7 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. diff --git a/network/89-ethernet.network.example b/network/89-ethernet.network.example index ce82b25728..58b323db6e 100644 --- a/network/89-ethernet.network.example +++ b/network/89-ethernet.network.example @@ -9,8 +9,9 @@ # by systemd-networkd and edit it there. # This file should not be edited in place, because it'll be overwritten on upgrades. -# Enable DHCPv4 and DHCPv6 on all ethernet links +# Enable DHCPv4 and DHCPv6 on all physical ethernet links [Match] +Kind=!* Type=ether [Network] |