From 6109cf8b61a4b7fbef447cab8fa1a07baf749cfd Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 18 Feb 2026 12:10:50 +0900 Subject: [PATCH] meson,test: sort unit files --- test/networkd-test.py | 8 ++-- test/test-network/systemd-networkd-tests.py | 50 ++++++++++----------- units/meson.build | 4 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/test/networkd-test.py b/test/networkd-test.py index a082f5456fc..62041201ca6 100755 --- a/test/networkd-test.py +++ b/test/networkd-test.py @@ -64,11 +64,11 @@ def setUpModule(): # Ensure we don't mess with an existing networkd config for u in [ 'systemd-networkd.socket', - 'systemd-networkd-varlink.socket', 'systemd-networkd-resolve-hook.socket', + 'systemd-networkd-varlink.socket', 'systemd-networkd.service', - 'systemd-resolved-varlink.socket', 'systemd-resolved-monitor.socket', + 'systemd-resolved-varlink.socket', 'systemd-resolved.service', ]: if subprocess.call(['systemctl', 'is-active', '--quiet', u]) == 0: @@ -279,8 +279,8 @@ Gateway=192.168.250.1 def tearDown(self): subprocess.check_call(['systemctl', 'stop', 'systemd-networkd.socket']) - subprocess.check_call(['systemctl', 'stop', 'systemd-networkd-varlink.socket']) subprocess.check_call(['systemctl', 'stop', 'systemd-networkd-resolve-hook.socket']) + subprocess.check_call(['systemctl', 'stop', 'systemd-networkd-varlink.socket']) subprocess.check_call(['systemctl', 'stop', 'systemd-networkd.service']) subprocess.check_call(['ip', 'link', 'del', 'mybridge']) subprocess.check_call(['ip', 'link', 'del', 'port1']) @@ -376,8 +376,8 @@ class ClientTestBase(NetworkdTestingUtilities): def tearDown(self): self.shutdown_iface() subprocess.call(['systemctl', 'stop', 'systemd-networkd.socket']) - subprocess.call(['systemctl', 'stop', 'systemd-networkd-varlink.socket']) subprocess.call(['systemctl', 'stop', 'systemd-networkd-resolve-hook.socket']) + subprocess.call(['systemctl', 'stop', 'systemd-networkd-varlink.socket']) subprocess.call(['systemctl', 'stop', 'systemd-networkd.service']) subprocess.call(['ip', 'link', 'del', 'dummy0'], stderr=subprocess.DEVNULL) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 2843be3e2a2..93e3ee626f5 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -425,8 +425,8 @@ def clear_udev_rules(): def save_active_units(): for u in [ 'systemd-networkd.socket', - 'systemd-networkd-varlink.socket', 'systemd-networkd-resolve-hook.socket', + 'systemd-networkd-varlink.socket', 'systemd-networkd.service', 'systemd-resolved-monitor.socket', 'systemd-resolved-varlink.socket', @@ -447,14 +447,14 @@ def restore_active_units(): call('systemctl stop systemd-networkd.socket') has_network_socket = True - if 'systemd-networkd-varlink.socket' in active_units: - call('systemctl stop systemd-networkd-varlink.socket') - has_network_socket = True - if 'systemd-networkd-resolve-hook.socket' in active_units: call('systemctl stop systemd-networkd-resolve-hook.socket') has_network_socket = True + if 'systemd-networkd-varlink.socket' in active_units: + call('systemctl stop systemd-networkd-varlink.socket') + has_network_socket = True + if 'systemd-resolved-monitor.socket' in active_units: call('systemctl stop systemd-resolved-monitor.socket') has_resolve_socket = True @@ -521,9 +521,9 @@ def setup_system_units(): for unit in [ 'systemd-networkd.service', 'systemd-networkd.socket', - 'systemd-networkd-varlink.socket', - 'systemd-networkd-resolve-hook.socket', 'systemd-networkd-persistent-storage.service', + 'systemd-networkd-resolve-hook.socket', + 'systemd-networkd-varlink.socket', 'systemd-resolved.service', 'systemd-timesyncd.service', 'systemd-udevd.service', @@ -548,14 +548,6 @@ def setup_system_units(): create_service_dropin('systemd-timesyncd', timesyncd_bin) # TODO: also run udevd with sanitizers, valgrind, or coverage - create_unit_dropin( - 'systemd-udevd.service', - [ - '[Service]', - 'ExecStart=', - f'ExecStart=@{udevadm_bin} systemd-udevd', - ] - ) create_unit_dropin( 'systemd-networkd.socket', [ @@ -564,10 +556,16 @@ def setup_system_units(): ] ) create_unit_dropin( - 'systemd-networkd-varlink.socket', + 'systemd-networkd-persistent-storage.service', [ '[Unit]', 'StartLimitIntervalSec=0', + '[Service]', + 'ExecStart=', + f'ExecStart={networkctl_bin} persistent-storage yes', + 'ExecStop=', + f'ExecStop={networkctl_bin} persistent-storage no', + 'Environment=SYSTEMD_LOG_LEVEL=debug' if enable_debug else '', ] ) create_unit_dropin( @@ -578,16 +576,18 @@ def setup_system_units(): ] ) create_unit_dropin( - 'systemd-networkd-persistent-storage.service', + 'systemd-networkd-varlink.socket', [ '[Unit]', 'StartLimitIntervalSec=0', + ] + ) + create_unit_dropin( + 'systemd-udevd.service', + [ '[Service]', 'ExecStart=', - f'ExecStart={networkctl_bin} persistent-storage yes', - 'ExecStop=', - f'ExecStop={networkctl_bin} persistent-storage no', - 'Environment=SYSTEMD_LOG_LEVEL=debug' if enable_debug else '', + f'ExecStart=@{udevadm_bin} systemd-udevd', ] ) @@ -608,9 +608,9 @@ def clear_system_units(): rm_unit('systemd-networkd.service') rm_unit('systemd-networkd.socket') - rm_unit('systemd-networkd-varlink.socket') - rm_unit('systemd-networkd-resolve-hook.socket') rm_unit('systemd-networkd-persistent-storage.service') + rm_unit('systemd-networkd-resolve-hook.socket') + rm_unit('systemd-networkd-varlink.socket') rm_unit('systemd-resolved.service') rm_unit('systemd-timesyncd.service') rm_unit('systemd-udevd.service') @@ -995,13 +995,13 @@ def stop_networkd(show_logs=True, check_failed=True): if check_failed: check_output('systemctl stop systemd-networkd.socket') - check_output('systemctl stop systemd-networkd-varlink.socket') check_output('systemctl stop systemd-networkd-resolve-hook.socket') + check_output('systemctl stop systemd-networkd-varlink.socket') check_output('systemctl stop systemd-networkd.service') else: call('systemctl stop systemd-networkd.socket') - call('systemctl stop systemd-networkd-varlink.socket') call('systemctl stop systemd-networkd-resolve-hook.socket') + call('systemctl stop systemd-networkd-varlink.socket') call('systemctl stop systemd-networkd.service') if show_logs: diff --git a/units/meson.build b/units/meson.build index 113a935c90b..80306754981 100644 --- a/units/meson.build +++ b/units/meson.build @@ -498,11 +498,11 @@ units = [ 'conditions' : ['ENABLE_NETWORKD'], }, { - 'file' : 'systemd-networkd-varlink.socket', + 'file' : 'systemd-networkd-resolve-hook.socket', 'conditions' : ['ENABLE_NETWORKD'], }, { - 'file' : 'systemd-networkd-resolve-hook.socket', + 'file' : 'systemd-networkd-varlink.socket', 'conditions' : ['ENABLE_NETWORKD'], }, { -- 2.47.3