2011-09-10 20:23:26 +01:00
|
|
|
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
|
2012-06-16 20:09:30 +01:00
|
|
|
index 0932139..5b5aee8 100644
|
2011-09-10 20:23:26 +01:00
|
|
|
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
|
|
|
|
|
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
|
|
|
|
|
@@ -68,10 +68,6 @@ const char *
|
|
|
|
|
nm_dhcp_dhclient_get_path (const char *try_first)
|
|
|
|
|
{
|
|
|
|
|
static const char *dhclient_paths[] = {
|
|
|
|
|
- "/sbin/dhclient",
|
|
|
|
|
- "/usr/sbin/dhclient",
|
|
|
|
|
- "/usr/pkg/sbin/dhclient",
|
|
|
|
|
- "/usr/local/sbin/dhclient",
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
const char **path = dhclient_paths;
|
|
|
|
|
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
|
|
|
|
|
index 237661f..48bc33f 100644
|
|
|
|
|
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
|
|
|
|
|
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
|
|
|
|
|
@@ -51,10 +51,6 @@ const char *
|
|
|
|
|
nm_dhcp_dhcpcd_get_path (const char *try_first)
|
|
|
|
|
{
|
|
|
|
|
static const char *dhcpcd_paths[] = {
|
|
|
|
|
- "/sbin/dhcpcd",
|
|
|
|
|
- "/usr/sbin/dhcpcd",
|
|
|
|
|
- "/usr/pkg/sbin/dhcpcd",
|
|
|
|
|
- "/usr/local/sbin/dhcpcd",
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
const char **path = dhcpcd_paths;
|
|
|
|
|
diff --git a/src/nm-device.c b/src/nm-device.c
|
2012-06-16 20:09:30 +01:00
|
|
|
index 1dc94ee..e60f3c8 100644
|
2011-09-10 20:23:26 +01:00
|
|
|
--- a/src/nm-device.c
|
|
|
|
|
+++ b/src/nm-device.c
|
2012-06-16 20:09:30 +01:00
|
|
|
@@ -1321,8 +1321,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason)
|
|
|
|
|
char *argv[6], *cmdline;
|
2011-09-10 20:23:26 +01:00
|
|
|
const char **aipd_binary = NULL;
|
|
|
|
|
static const char *aipd_paths[] = {
|
|
|
|
|
- "/usr/sbin/avahi-autoipd",
|
|
|
|
|
- "/usr/local/sbin/avahi-autoipd",
|
2012-03-10 23:13:32 +00:00
|
|
|
+ "@avahi@/sbin/avahi-autoipd",
|
2011-09-10 20:23:26 +01:00
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
int i = 0;
|
2012-06-16 20:09:30 +01:00
|
|
|
@@ -2555,7 +2554,7 @@ share_init (void)
|
2011-09-10 20:23:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (iter = modules; *iter; iter++) {
|
|
|
|
|
- char *argv[3] = { "/sbin/modprobe", *iter, NULL };
|
2016-08-15 08:32:51 +01:00
|
|
|
+ char *argv[3] = { "@kmod@/bin/modprobe", *iter, NULL };
|
2011-09-10 20:23:26 +01:00
|
|
|
char *envp[1] = { NULL };
|
|
|
|
|
GError *error = NULL;
|
|
|
|
|
|
|
|
|
|
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
|
2012-06-16 20:09:30 +01:00
|
|
|
index 59698c3..7dba0f7 100644
|
2011-09-10 20:23:26 +01:00
|
|
|
--- a/src/ppp-manager/nm-ppp-manager.c
|
|
|
|
|
+++ b/src/ppp-manager/nm-ppp-manager.c
|
|
|
|
|
@@ -661,9 +661,7 @@ static inline const char *
|
|
|
|
|
nm_find_pppd (void)
|
|
|
|
|
{
|
|
|
|
|
static const char *pppd_binary_paths[] = {
|
|
|
|
|
- "/usr/local/sbin/pppd",
|
|
|
|
|
- "/usr/sbin/pppd",
|
|
|
|
|
- "/sbin/pppd",
|
|
|
|
|
+ "@ppp@/sbin/pppd",
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
2012-06-16 20:09:30 +01:00
|
|
|
@@ -988,7 +986,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
|
2011-09-10 20:23:26 +01:00
|
|
|
|
|
|
|
|
/* Make sure /dev/ppp exists (bgo #533064) */
|
|
|
|
|
if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))
|
|
|
|
|
- ignored = system ("/sbin/modprobe ppp_generic");
|
2016-08-15 08:32:51 +01:00
|
|
|
+ ignored = system ("@kmod@/bin/modprobe ppp_generic");
|
2011-09-10 20:23:26 +01:00
|
|
|
|
|
|
|
|
connection = nm_act_request_get_connection (req);
|
|
|
|
|
g_assert (connection);
|
