1--- a/clients/common/nm-vpn-helpers.c
2+++ b/clients/common/nm-vpn-helpers.c
3@@ -205,7 +205,7 @@
4 char *argv[4];
5 const char *path;
6
7- path = nm_utils_find_helper ("openconnect", "/usr/sbin/openconnect", error);
8+ path = "@openconnect@/bin/openconnect";
9 if (!path)
10 return FALSE;
11
12--- a/src/devices/nm-device.c
13+++ b/src/devices/nm-device.c
14@@ -11828,14 +11828,14 @@
15 gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
16 if (gw) {
17 nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
18- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL);
19+ ping_binary = "@inetutils@/bin/ping";
20 log_domain = LOGD_IP4;
21 }
22 } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) {
23 gw = nm_ip6_config_best_default_route_get (priv->ip_config_6);
24 if (gw) {
25 nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
26- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL);
27+ ping_binary = "@inetutils@/bin/ping";
28 log_domain = LOGD_IP6;
29 }
30 }
31--- a/src/nm-core-utils.c
32+++ b/src/nm-core-utils.c
33@@ -428,7 +428,7 @@
34
35 /* construct the argument list */
36 argv = g_ptr_array_sized_new (4);
37- g_ptr_array_add (argv, "/sbin/modprobe");
38+ g_ptr_array_add (argv, "@kmod@/bin/modprobe");
39 g_ptr_array_add (argv, (char *) arg1);
40
41 va_start (ap, arg1);