]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-network: correctly support running systemd-udevd from the build dir
authorFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 17 Jul 2023 10:55:12 +0000 (12:55 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 17 Jul 2023 10:56:58 +0000 (12:56 +0200)
We create the udevadm -> systemd-udevd symlink during the install phase,
so it doesn't exist in the just compiled tree. This worked in CI since
the symlink is manually created there post-build.

test/test-network/systemd-networkd-tests.py

index 60654c71f9c75dd91343e0c65283ed6dc1151523..fca7408a0db3152226613bf5f0e5010d1846e559 100755 (executable)
@@ -695,7 +695,7 @@ def setUpModule():
         [
             '[Service]',
             'ExecStart=',
-            f'ExecStart=!!{udevd_bin}',
+            f'ExecStart=!!@{udevd_bin} systemd-udevd',
         ]
     )
     create_unit_dropin(
@@ -5882,7 +5882,7 @@ if __name__ == '__main__':
         networkd_bin = os.path.join(ns.build_dir, 'systemd-networkd')
         resolved_bin = os.path.join(ns.build_dir, 'systemd-resolved')
         timesyncd_bin = os.path.join(ns.build_dir, 'systemd-timesyncd')
-        udevd_bin = os.path.join(ns.build_dir, 'systemd-udevd')
+        udevd_bin = os.path.join(ns.build_dir, 'udevadm')
         wait_online_bin = os.path.join(ns.build_dir, 'systemd-networkd-wait-online')
         networkctl_bin = os.path.join(ns.build_dir, 'networkctl')
         resolvectl_bin = os.path.join(ns.build_dir, 'resolvectl')