From 5a000cd46f082346a18d04f5948728d6c2e301d2 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 17 Jul 2023 12:55:12 +0200 Subject: [PATCH] test-network: correctly support running systemd-udevd from the build dir 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 60654c71f9..fca7408a0d 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -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')