pyrox.dev
lol
1diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
2index 0932139..5b5aee8 100644
3--- a/src/dhcp-manager/nm-dhcp-dhclient.c
4+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
5@@ -68,10 +68,6 @@ const char *
6 nm_dhcp_dhclient_get_path (const char *try_first)
7 {
8 static const char *dhclient_paths[] = {
9- "/sbin/dhclient",
10- "/usr/sbin/dhclient",
11- "/usr/pkg/sbin/dhclient",
12- "/usr/local/sbin/dhclient",
13 NULL
14 };
15 const char **path = dhclient_paths;
16diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
17index 237661f..48bc33f 100644
18--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
19+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
20@@ -51,10 +51,6 @@ const char *
21 nm_dhcp_dhcpcd_get_path (const char *try_first)
22 {
23 static const char *dhcpcd_paths[] = {
24- "/sbin/dhcpcd",
25- "/usr/sbin/dhcpcd",
26- "/usr/pkg/sbin/dhcpcd",
27- "/usr/local/sbin/dhcpcd",
28 NULL
29 };
30 const char **path = dhcpcd_paths;
31diff --git a/src/nm-device.c b/src/nm-device.c
32index 1dc94ee..e60f3c8 100644
33--- a/src/nm-device.c
34+++ b/src/nm-device.c
35@@ -1321,8 +1321,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason)
36 char *argv[6], *cmdline;
37 const char **aipd_binary = NULL;
38 static const char *aipd_paths[] = {
39- "/usr/sbin/avahi-autoipd",
40- "/usr/local/sbin/avahi-autoipd",
41+ "@avahi@/sbin/avahi-autoipd",
42 NULL
43 };
44 int i = 0;
45@@ -2555,7 +2554,7 @@ share_init (void)
46 }
47
48 for (iter = modules; *iter; iter++) {
49- char *argv[3] = { "/sbin/modprobe", *iter, NULL };
50+ char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL };
51 char *envp[1] = { NULL };
52 GError *error = NULL;
53
54diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
55index 59698c3..7dba0f7 100644
56--- a/src/ppp-manager/nm-ppp-manager.c
57+++ b/src/ppp-manager/nm-ppp-manager.c
58@@ -661,9 +661,7 @@ static inline const char *
59 nm_find_pppd (void)
60 {
61 static const char *pppd_binary_paths[] = {
62- "/usr/local/sbin/pppd",
63- "/usr/sbin/pppd",
64- "/sbin/pppd",
65+ "@ppp@/sbin/pppd",
66 NULL
67 };
68
69@@ -988,7 +986,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
70
71 /* Make sure /dev/ppp exists (bgo #533064) */
72 if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))
73- ignored = system ("/sbin/modprobe ppp_generic");
74+ ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic");
75
76 connection = nm_act_request_get_connection (req);
77 g_assert (connection);