mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-28 00:24:18 +00:00
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
|
--- a/clients/common/nm-vpn-helpers.c
|
||
|
|
+++ b/clients/common/nm-vpn-helpers.c
|
||
|
|
@@ -205,7 +205,7 @@
|
||
|
|
char *argv[4];
|
||
|
|
const char *path;
|
||
|
|
|
||
|
|
- path = nm_utils_find_helper ("openconnect", "/usr/sbin/openconnect", error);
|
||
|
|
+ path = "@openconnect@/bin/openconnect";
|
||
|
|
if (!path)
|
||
|
|
return FALSE;
|
||
|
|
|
||
|
|
--- a/src/devices/nm-device.c
|
||
|
|
+++ b/src/devices/nm-device.c
|
||
|
|
@@ -11828,14 +11828,14 @@
|
||
|
|
gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
|
||
|
|
if (gw) {
|
||
|
|
nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
|
||
|
|
- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL);
|
||
|
|
+ ping_binary = "@inetutils@/bin/ping";
|
||
|
|
log_domain = LOGD_IP4;
|
||
|
|
}
|
||
|
|
} else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) {
|
||
|
|
gw = nm_ip6_config_best_default_route_get (priv->ip_config_6);
|
||
|
|
if (gw) {
|
||
|
|
nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
|
||
|
|
- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL);
|
||
|
|
+ ping_binary = "@inetutils@/bin/ping";
|
||
|
|
log_domain = LOGD_IP6;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--- a/src/nm-core-utils.c
|
||
|
|
+++ b/src/nm-core-utils.c
|
||
|
|
@@ -428,7 +428,7 @@
|
||
|
|
|
||
|
|
/* construct the argument list */
|
||
|
|
argv = g_ptr_array_sized_new (4);
|
||
|
|
- g_ptr_array_add (argv, "/sbin/modprobe");
|
||
|
|
+ g_ptr_array_add (argv, "@kmod@/bin/modprobe");
|
||
|
|
g_ptr_array_add (argv, (char *) arg1);
|
||
|
|
|
||
|
|
va_start (ap, arg1);
|