tjh.dev
1diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
2index 148acade5c..6395fbfbe5 100644
3--- a/data/84-nm-drivers.rules
4+++ b/data/84-nm-drivers.rules
5@@ -7,6 +7,6 @@ ACTION!="add|change|move", GOTO="nm_drivers_end"
6 # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
7 ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
8 DRIVERS=="?*", GOTO="nm_drivers_end"
9-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
10+PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
11
12 LABEL="nm_drivers_end"
13diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
14index e23b3a5282..c7246a3b61 100644
15--- a/data/NetworkManager.service.in
16+++ b/data/NetworkManager.service.in
17@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@
18 [Service]
19 Type=dbus
20 BusName=org.freedesktop.NetworkManager
21-ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
22+ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
23 #ExecReload=/bin/kill -HUP $MAINPID
24 ExecStart=@sbindir@/NetworkManager --no-daemon
25 Restart=on-failure
26diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
27index 3565c04d59..52c58fec24 100644
28--- a/src/core/devices/nm-device.c
29+++ b/src/core/devices/nm-device.c
30@@ -14005,14 +14005,14 @@ nm_device_start_ip_check(NMDevice *self)
31 gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);
32 if (gw) {
33 nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
34- ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL);
35+ ping_binary = "@iputils@/bin/ping";
36 log_domain = LOGD_IP4;
37 }
38 } else if (priv->ip_data_6.state == NM_DEVICE_IP_STATE_READY) {
39 gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET6);
40 if (gw) {
41 nm_inet6_ntop(&NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway, buf);
42- ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL);
43+ ping_binary = "@iputils@/bin/ping";
44 log_domain = LOGD_IP6;
45 }
46 }
47diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
48index 143126c51a..a7143443ec 100644
49--- a/src/libnm-client-impl/meson.build
50+++ b/src/libnm-client-impl/meson.build
51@@ -172,7 +172,6 @@ if enable_introspection
52 input: libnm_core_settings_sources,
53 output: 'nm-propery-infos-' + info + '.xml',
54 command: [
55- python.path(),
56 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'),
57 info,
58 '@OUTPUT@',
59@@ -229,7 +228,6 @@ if enable_introspection
60 'env',
61 'GI_TYPELIB_PATH=' + gi_typelib_path,
62 'LD_LIBRARY_PATH=' + ld_library_path,
63- python.path(),
64 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
65 '--lib-path', meson.current_build_dir(),
66 '--gir', '@INPUT@',
67diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c
68index bebc53a851..93710455d5 100644
69--- a/src/libnm-platform/nm-platform-utils.c
70+++ b/src/libnm-platform/nm-platform-utils.c
71@@ -2209,7 +2209,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *
72
73 /* construct the argument list */
74 argv = g_ptr_array_sized_new(4);
75- g_ptr_array_add(argv, "/sbin/modprobe");
76+ g_ptr_array_add(argv, "@kmod@/bin/modprobe");
77 g_ptr_array_add(argv, "--use-blacklist");
78 g_ptr_array_add(argv, (char *) arg1);
79
80diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
81index 476fbe518e..2641dbf637 100644
82--- a/src/libnmc-base/nm-vpn-helpers.c
83+++ b/src/libnmc-base/nm-vpn-helpers.c
84@@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host,
85 gs_free const char **output_v = NULL;
86 const char *const *iter;
87 const char *path;
88- const char *const DEFAULT_PATHS[] = {
89- "/sbin/",
90- "/usr/sbin/",
91- "/usr/local/sbin/",
92- "/bin/",
93- "/usr/bin/",
94- "/usr/local/bin/",
95- NULL,
96- };
97
98- path = nm_utils_file_search_in_paths("openconnect",
99- "/usr/sbin/openconnect",
100- DEFAULT_PATHS,
101- G_FILE_TEST_IS_EXECUTABLE,
102- NULL,
103- NULL,
104- error);
105- if (!path)
106- return FALSE;
107+ path = "@openconnect@/bin/openconnect";
108
109 if (!g_spawn_sync(NULL,
110 (char **) NM_MAKE_STRV(path, "--authenticate", host),
111diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
112index cf8a21fc80..61b992a50e 100644
113--- a/src/libnmc-setting/meson.build
114+++ b/src/libnmc-setting/meson.build
115@@ -7,7 +7,6 @@ if enable_docs
116 input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']],
117 output: 'settings-docs-input.xml',
118 command: [
119- python.path(),
120 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'),
121 '@OUTPUT@',
122 nm_property_infos_xml['nmcli'],
123diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build
124index 6dc0f2a2c8..0a32977a59 100644
125--- a/src/tests/client/meson.build
126+++ b/src/tests/client/meson.build
127@@ -6,7 +6,6 @@ test(
128 args: [
129 build_root,
130 source_root,
131- python.path(),
132 '--',
133 ],
134 env: [