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/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
14index f3441508ab..7cde8d7d39 100644
15--- a/src/core/devices/nm-device.c
16+++ b/src/core/devices/nm-device.c
17@@ -14839,14 +14839,14 @@ nm_device_start_ip_check(NMDevice *self)
18 gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);
19 if (gw) {
20 nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
21- ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL);
22+ ping_binary = "@iputils@/bin/ping";
23 log_domain = LOGD_IP4;
24 }
25 } else if (priv->ip_data_6.state == NM_DEVICE_IP_STATE_READY) {
26 gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET6);
27 if (gw) {
28 nm_inet6_ntop(&NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway, buf);
29- ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL);
30+ ping_binary = "@iputils@/bin/ping";
31 log_domain = LOGD_IP6;
32 }
33 }
34diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
35index cbe76f5f1c..8515f94994 100644
36--- a/src/libnmc-base/nm-vpn-helpers.c
37+++ b/src/libnmc-base/nm-vpn-helpers.c
38@@ -284,15 +284,6 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets,
39 const char *const *iter;
40 const char *path;
41 const char *opt;
42- const char *const DEFAULT_PATHS[] = {
43- "/sbin/",
44- "/usr/sbin/",
45- "/usr/local/sbin/",
46- "/bin/",
47- "/usr/bin/",
48- "/usr/local/bin/",
49- NULL,
50- };
51 const char *oc_argv[(12 + 2 * G_N_ELEMENTS(oc_property_args))];
52 const char *gw;
53 int port;
54@@ -311,15 +302,7 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets,
55
56 port = extract_url_port(gw);
57
58- path = nm_utils_file_search_in_paths("openconnect",
59- "/usr/sbin/openconnect",
60- DEFAULT_PATHS,
61- G_FILE_TEST_IS_EXECUTABLE,
62- NULL,
63- NULL,
64- error);
65- if (!path)
66- return FALSE;
67+ path = "@openconnect@/bin/openconnect";
68
69 oc_argv[oc_argc++] = path;
70 oc_argv[oc_argc++] = "--authenticate";