pyrox.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 f09ae86ceb..b2ecb405ef 100644
15--- a/data/NetworkManager.service.in
16+++ b/data/NetworkManager.service.in
17@@ -9,7 +9,7 @@ BindsTo=dbus.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 2038e2f205..90bf9fa28b 100644
28--- a/src/core/devices/nm-device.c
29+++ b/src/core/devices/nm-device.c
30@@ -14275,14 +14275,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 fb879dca47..13cc2867e1 100644
49--- a/src/libnm-client-impl/meson.build
50+++ b/src/libnm-client-impl/meson.build
51@@ -173,7 +173,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@@ -230,7 +229,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/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
68index cbe76f5f1c..8515f94994 100644
69--- a/src/libnmc-base/nm-vpn-helpers.c
70+++ b/src/libnmc-base/nm-vpn-helpers.c
71@@ -284,15 +284,6 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets,
72 const char *const *iter;
73 const char *path;
74 const char *opt;
75- const char *const DEFAULT_PATHS[] = {
76- "/sbin/",
77- "/usr/sbin/",
78- "/usr/local/sbin/",
79- "/bin/",
80- "/usr/bin/",
81- "/usr/local/bin/",
82- NULL,
83- };
84 const char *oc_argv[(12 + 2 * G_N_ELEMENTS(oc_property_args))];
85 const char *gw;
86 int port;
87@@ -311,15 +302,7 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets,
88
89 port = extract_url_port(gw);
90
91- path = nm_utils_file_search_in_paths("openconnect",
92- "/usr/sbin/openconnect",
93- DEFAULT_PATHS,
94- G_FILE_TEST_IS_EXECUTABLE,
95- NULL,
96- NULL,
97- error);
98- if (!path)
99- return FALSE;
100+ path = "@openconnect@/bin/openconnect";
101
102 oc_argv[oc_argc++] = path;
103 oc_argv[oc_argc++] = "--authenticate";
104diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
105index cf8a21fc80..61d8e140e2 100644
106--- a/src/libnmc-setting/meson.build
107+++ b/src/libnmc-setting/meson.build
108@@ -7,7 +7,6 @@ if enable_docs
109 input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']],
110 output: 'settings-docs-input.xml',
111 command: [
112- python.path(),
113 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'),
114 '@OUTPUT@',
115 nm_property_infos_xml['nmcli'],
116@@ -20,7 +19,6 @@ if enable_docs
117 input: settings_docs_input_xml,
118 output: 'settings-docs.h',
119 command: [
120- python.path(),
121 join_paths(meson.source_root(), 'tools', 'generate-docs-settings-docs.py'),
122 '--output', '@OUTPUT@',
123 '--xml', '@INPUT@'
124diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build
125index 8c36e40559..cfb6649a21 100644
126--- a/src/tests/client/meson.build
127+++ b/src/tests/client/meson.build
128@@ -6,7 +6,6 @@ test(
129 args: [
130 build_root,
131 source_root,
132- python.path(),
133 '--',
134 'TestNmcli',
135 ],
136@@ -23,7 +22,6 @@ if enable_nm_cloud_setup
137 args: [
138 build_root,
139 source_root,
140- python.path(),
141 '--',
142 'TestNmCloudSetup',
143 ],