tjh.dev
1--- a/clients/common/nm-vpn-helpers.c
2+++ b/clients/common/nm-vpn-helpers.c
3@@ -214,10 +214,7 @@
4 NULL,
5 };
6
7- path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS,
8- G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
9- if (!path)
10- return FALSE;
11+ path = "@openconnect@/bin/openconnect";
12
13 argv[0] = (char *) path;
14 argv[1] = "--authenticate";
15--- a/data/84-nm-drivers.rules
16+++ b/data/84-nm-drivers.rules
17@@ -7,6 +7,6 @@
18 # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
19 ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
20 DRIVERS=="?*", GOTO="nm_drivers_end"
21-PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
22+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @coreutils@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
23
24 LABEL="nm_drivers_end"
25--- a/data/NetworkManager.service.in
26+++ b/data/NetworkManager.service.in
27@@ -8,7 +8,7 @@
28 [Service]
29 Type=dbus
30 BusName=org.freedesktop.NetworkManager
31-ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0
32+ExecReload=@dbus@/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0
33 #ExecReload=/bin/kill -HUP $MAINPID
34 ExecStart=@sbindir@/NetworkManager --no-daemon
35 Restart=on-failure
36--- a/src/devices/nm-device.c
37+++ b/src/devices/nm-device.c
38@@ -12350,14 +12350,14 @@
39 gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
40 if (gw) {
41 nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
42- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL);
43+ ping_binary = "@inetutils@/bin/ping";
44 log_domain = LOGD_IP4;
45 }
46 } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) {
47 gw = nm_ip6_config_best_default_route_get (priv->ip_config_6);
48 if (gw) {
49 nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
50- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL);
51+ ping_binary = "@inetutils@/bin/ping";
52 log_domain = LOGD_IP6;
53 }
54 }
55--- a/src/nm-core-utils.c
56+++ b/src/nm-core-utils.c
57@@ -421,7 +421,7 @@
58
59 /* construct the argument list */
60 argv = g_ptr_array_sized_new (4);
61- g_ptr_array_add (argv, "/sbin/modprobe");
62+ g_ptr_array_add (argv, "@kmod@/bin/modprobe");
63 g_ptr_array_add (argv, (char *) arg1);
64
65 va_start (ap, arg1);