mirror of
https://github.com/systemd/systemd
synced 2024-10-15 20:45:09 +00:00
Merge pull request #16850 from mbiebl/networkd-socket-activation
networkd: use socket activation when starting networkd
This commit is contained in:
commit
9654645b62
|
@ -223,7 +223,8 @@ Gateway=192.168.250.1''')
|
|||
subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
|
||||
|
||||
def tearDown(self):
|
||||
subprocess.check_call(['systemctl', 'stop', 'systemd-networkd'])
|
||||
subprocess.check_call(['systemctl', 'stop', 'systemd-networkd.socket'])
|
||||
subprocess.check_call(['systemctl', 'stop', 'systemd-networkd.service'])
|
||||
subprocess.check_call(['ip', 'link', 'del', 'mybridge'])
|
||||
subprocess.check_call(['ip', 'link', 'del', 'port1'])
|
||||
subprocess.check_call(['ip', 'link', 'del', 'port2'])
|
||||
|
@ -309,7 +310,8 @@ class ClientTestBase(NetworkdTestingUtilities):
|
|||
|
||||
def tearDown(self):
|
||||
self.shutdown_iface()
|
||||
subprocess.call(['systemctl', 'stop', 'systemd-networkd'])
|
||||
subprocess.call(['systemctl', 'stop', 'systemd-networkd.socket'])
|
||||
subprocess.call(['systemctl', 'stop', 'systemd-networkd.service'])
|
||||
subprocess.call(['ip', 'link', 'del', 'dummy0'],
|
||||
stderr=subprocess.DEVNULL)
|
||||
|
||||
|
@ -987,7 +989,8 @@ class MatchClientTest(unittest.TestCase, NetworkdTestingUtilities):
|
|||
|
||||
def tearDown(self):
|
||||
"""Stop networkd."""
|
||||
subprocess.call(['systemctl', 'stop', 'systemd-networkd'])
|
||||
subprocess.call(['systemctl', 'stop', 'systemd-networkd.socket'])
|
||||
subprocess.call(['systemctl', 'stop', 'systemd-networkd.service'])
|
||||
|
||||
def test_basic_matching(self):
|
||||
"""Verify the Name= line works throughout this class."""
|
||||
|
@ -1037,7 +1040,8 @@ class UnmanagedClientTest(unittest.TestCase, NetworkdTestingUtilities):
|
|||
|
||||
def tearDown(self):
|
||||
"""Stop networkd."""
|
||||
subprocess.call(['systemctl', 'stop', 'systemd-networkd'])
|
||||
subprocess.call(['systemctl', 'stop', 'systemd-networkd.socket'])
|
||||
subprocess.call(['systemctl', 'stop', 'systemd-networkd.service'])
|
||||
|
||||
def create_iface(self):
|
||||
"""Create temporary veth pairs for interface matching."""
|
||||
|
|
|
@ -328,7 +328,7 @@ def tearDownModule():
|
|||
|
||||
shutil.rmtree(networkd_ci_path)
|
||||
|
||||
for u in ['systemd-networkd.service', 'systemd-resolved.service']:
|
||||
for u in ['systemd-networkd.socket', 'systemd-networkd.service', 'systemd-resolved.service']:
|
||||
check_output(f'systemctl stop {u}')
|
||||
|
||||
shutil.rmtree('/run/systemd/system/systemd-networkd.service.d')
|
||||
|
@ -464,7 +464,8 @@ def remove_networkd_state_files():
|
|||
def stop_networkd(show_logs=True, remove_state_files=True):
|
||||
if show_logs:
|
||||
invocation_id = check_output('systemctl show systemd-networkd -p InvocationID --value')
|
||||
check_output('systemctl stop systemd-networkd')
|
||||
check_output('systemctl stop systemd-networkd.socket')
|
||||
check_output('systemctl stop systemd-networkd.service')
|
||||
if show_logs:
|
||||
print(check_output('journalctl _SYSTEMD_INVOCATION_ID=' + invocation_id))
|
||||
if remove_state_files:
|
||||
|
@ -2447,7 +2448,8 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
|
|||
self.assertRegex(output, 'Search Domains: one')
|
||||
|
||||
def test_keep_configuration_static(self):
|
||||
check_output('systemctl stop systemd-networkd')
|
||||
check_output('systemctl stop systemd-networkd.socket')
|
||||
check_output('systemctl stop systemd-networkd.service')
|
||||
|
||||
check_output('ip link add name dummy98 type dummy')
|
||||
check_output('ip address add 10.1.2.3/16 dev dummy98')
|
||||
|
@ -3610,7 +3612,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
|
|||
print(output)
|
||||
self.assertRegex(output, r'192.168.5.*')
|
||||
|
||||
check_output('systemctl stop systemd-networkd')
|
||||
check_output('systemctl stop systemd-networkd.socket')
|
||||
check_output('systemctl stop systemd-networkd.service')
|
||||
|
||||
print('The lease address should be kept after networkd stopped')
|
||||
output = check_output('ip address show dev veth99 scope global')
|
||||
|
@ -3645,7 +3648,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
|
|||
self.assertRegex(output, r'192.168.5.*')
|
||||
|
||||
stop_dnsmasq(dnsmasq_pid_file)
|
||||
check_output('systemctl stop systemd-networkd')
|
||||
check_output('systemctl stop systemd-networkd.socket')
|
||||
check_output('systemctl stop systemd-networkd.service')
|
||||
|
||||
output = check_output('ip address show dev veth99 scope global')
|
||||
print(output)
|
||||
|
|
|
@ -13,10 +13,10 @@ Documentation=man:systemd-networkd.service(8)
|
|||
ConditionCapability=CAP_NET_ADMIN
|
||||
DefaultDependencies=no
|
||||
# systemd-udevd.service can be dropped once tuntap is moved to netlink
|
||||
After=systemd-udevd.service network-pre.target systemd-sysusers.service systemd-sysctl.service
|
||||
After=systemd-networkd.socket systemd-udevd.service network-pre.target systemd-sysusers.service systemd-sysctl.service
|
||||
Before=network.target multi-user.target shutdown.target
|
||||
Conflicts=shutdown.target
|
||||
Wants=network.target
|
||||
Wants=systemd-networkd.socket network.target
|
||||
|
||||
[Service]
|
||||
AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW
|
||||
|
|
Loading…
Reference in a new issue