shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

network: take explicit ownership of our own interfaces

Browse Source 
This is a follow-up for #30786 and uses it to assign
ID_NET_MANAGED_BY=io.systemd.Network to all all network interfaces that
we consider ours to manage. This should hopefully have the effect that
other well-behaving managers won't fight for these devices.

This doesn't bother with network interfaces we match inside containers,
since udev is not available there anyway.
This commit is contained in:
Lennart Poettering 2024-01-10 16:18:41 +01:00 committed by Luca Boccassi
parent d6b39152a9
commit 658169e6d3
9 changed files with 131 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
network/80-6rd-tunnel.link Normal file
View File

@ -0,0 +1,24 @@
# SPDX-License-Identifier: MIT-0
#
# This config file is installed as part of systemd.
# It may be freely copied and edited (following the MIT No Attribution license).
#
# To make local modifications, one of the following methods may be used:
# 1. add a drop-in file that extends this file by creating the
# /etc/systemd/network/80-6rd-tunnel.link.d/ directory and creating a
# new .conf file there.
# 2. copy this file into /etc/systemd/network/ or one of the other paths checked
# by systemd-udevd and edit it there.
# This file should not be edited in place, because it'll be overwritten on upgrades.
# This .link file matches 6rd-* SIT devices and marks them as managed by
# systemd-networkd.
[Match]
Kind=sit
Name=6rd-*
[Network]
NamePolicy=keep
MACAddressPolicy=persistent
Property=ID_NET_MANAGED_BY=io.systemd.Network

4
network/80-6rd-tunnel.network
View File

@ -7,11 +7,11 @@
# 1. add a drop-in file that extends this file by creating the
# /etc/systemd/network/80-6rd-tunnel.network.d/ directory and creating a
# new .conf file there.
# 2. copy this file into /etc/systemd/network or one of the other paths checked
# 2. copy this file into /etc/systemd/network/ or one of the other paths checked
# by systemd-networkd and edit it there.
# This file should not be edited in place, because it'll be overwritten on upgrades.
# This network file matches 6rd-* SIT devices which is automatically created by
# This .network file matches 6rd-* SIT devices which is automatically created by
# systemd-networkd when DHCPv4 6RD option is received.
[Match]

24
network/80-container-vb.link Normal file
View File

@ -0,0 +1,24 @@
# SPDX-License-Identifier: MIT-0
#
# This config file is installed as part of systemd.
# It may be freely copied and edited (following the MIT No Attribution license).
#
# To make local modifications, one of the following methods may be used:
# 1. add a drop-in file that extends this file by creating the
# /etc/systemd/network/80-container-vb.link.d/ directory and creating a
# new .conf file there.
# 2. copy this file into /etc/systemd/network/ or one of the other paths checked
# by systemd-udevd and edit it there.
# This file should not be edited in place, because it'll be overwritten on upgrades.
# This .link file matches the host-side of the virtual Ethernet link created
# by systemd-nspawn's --network-veth switch with --network-bridge= or
# --network-zone= switch. See systemd-nspawn(1) for details.
[Match]
Kind=veth
Name=vb-*
[Link]
NamePolicy=keep
Property=ID_NET_MANAGED_BY=io.systemd.Network

8
network/80-container-vb.network
View File

@ -7,13 +7,13 @@
# 1. add a drop-in file that extends this file by creating the
# /etc/systemd/network/80-container-vb.network.d/ directory and creating a
# new .conf file there.
# 2. copy this file into /etc/systemd/network or one of the other paths checked
# 2. copy this file into /etc/systemd/network/ or one of the other paths checked
# by systemd-networkd and edit it there.
# This file should not be edited in place, because it'll be overwritten on upgrades.
# This network file matches the host-side of the virtual Ethernet link
# created by systemd-nspawn's --network-veth switch with --network-bridge or
# --network-zone switch. See systemd-nspawn(1) for details.
# This .network file matches the host-side of the virtual Ethernet link created
# by systemd-nspawn's --network-veth switch with --network-bridge= or
# --network-zone= switch. See systemd-nspawn(1) for details.
[Match]
Kind=veth

24
network/80-container-ve.link Normal file
View File

@ -0,0 +1,24 @@
# SPDX-License-Identifier: MIT-0
#
# This config file is installed as part of systemd.
# It may be freely copied and edited (following the MIT No Attribution license).
#
# To make local modifications, one of the following methods may be used:
# 1. add a drop-in file that extends this file by creating the
# /etc/systemd/network/80-container-ve.link.d/ directory and creating a
# new .conf file there.
# 2. copy this file into /etc/systemd/network/ or one of the other paths checked
# by systemd-udevd and edit it there.
# This file should not be edited in place, because it'll be overwritten on upgrades.
# This .link file matches the host-side of the virtual Ethernet link
# created by systemd-nspawn's --network-veth switch. See systemd-nspawn(1) for
# details.
[Match]
Kind=veth
Name=ve-*
[Link]
NamePolicy=keep
Property=ID_NET_MANAGED_BY=io.systemd.Network

4
network/80-container-ve.network
View File

@ -7,11 +7,11 @@
# 1. add a drop-in file that extends this file by creating the
# /etc/systemd/network/80-container-ve.network.d/ directory and creating a
# new .conf file there.
# 2. copy this file into /etc/systemd/network or one of the other paths checked
# 2. copy this file into /etc/systemd/network/ or one of the other paths checked
# by systemd-networkd and edit it there.
# This file should not be edited in place, because it'll be overwritten on upgrades.
# This network file matches the host-side of the virtual Ethernet link
# This .network file matches the host-side of the virtual Ethernet link
# created by systemd-nspawn's --network-veth switch. See systemd-nspawn(1) for
# details.

23
network/80-container-vz.link Normal file
View File

@ -0,0 +1,23 @@
# SPDX-License-Identifier: MIT-0
#
# This config file is installed as part of systemd.
# It may be freely copied and edited (following the MIT No Attribution license).
#
# To make local modifications, one of the following methods may be used:
# 1. add a drop-in file that extends this file by creating the
# /etc/systemd/network/80-container-vz.link.d/ directory and creating a
# new .conf file there.
# 2. copy this file into /etc/systemd/network/ or one of the other paths checked
# by systemd-udevd and edit it there.
# This file should not be edited in place, because it'll be overwritten on upgrades.
# This .link file matches the bridge interface created by systemd-nspawn's
# --network-zone= switch. See systemd-nspawn(1) for details.
[Match]
Kind=bridge
Name=vz-*
[Link]
NamePolicy=keep
Property=ID_NET_MANAGED_BY=io.systemd.Network

23
network/80-vm-vt.link Normal file
View File

@ -0,0 +1,23 @@
# SPDX-License-Identifier: MIT-0
#
# This config file is installed as part of systemd.
# It may be freely copied and edited (following the MIT No Attribution license).
#
# To make local modifications, one of the following methods may be used:
# 1. add a drop-in file that extends this file by creating the
# /etc/systemd/network/80-vm-vt.link.d/ directory and creating a
# new .conf file there.
# 2. copy this file into /etc/systemd/network/ or one of the other paths checked
# by systemd-udevd and edit it there.
# This file should not be edited in place, because it'll be overwritten on upgrades.
# This .link file matches vt-* TUN/TAP devices on the host and marks them as
# managed by systemd-networkd.
[Match]
Kind=tun
Name=vt-*
[Link]
NamePolicy=keep
Property=ID_NET_MANAGED_BY=io.systemd.Network

5
network/meson.build
View File

@ -3,11 +3,16 @@
if conf.get('ENABLE_NETWORKD') == 1
install_data(
'80-6rd-tunnel.network',
'80-6rd-tunnel.link',
'80-container-host0.network',
'80-container-vb.network',
'80-container-vb.link',
'80-container-ve.network',
'80-container-ve.link',
'80-container-vz.network',
'80-container-vz.link',
'80-vm-vt.network',
'80-vm-vt.link',
'80-wifi-adhoc.network',
install_dir : networkdir)