diff options
Diffstat (limited to 'pkgs/tools/networking/network-manager/nixos-purity.patch')
| -rw-r--r-- | pkgs/tools/networking/network-manager/nixos-purity.patch | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch index 5736009571e..831b2010fcf 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -28,36 +28,6 @@ index 237661f..48bc33f 100644 NULL }; const char **path = dhcpcd_paths; -diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c -index 8e216f4..6e00210 100644 ---- a/src/dns-manager/nm-dns-dnsmasq.c -+++ b/src/dns-manager/nm-dns-dnsmasq.c -@@ -52,9 +52,7 @@ static inline const char * - find_dnsmasq (void) - { - static const char *paths[] = { -- "/usr/local/sbin/dnsmasq", -- "/usr/sbin/dnsmasq", -- "/sbin/dnsmasq", -+ "@dnsmasq@/bin/dnsmasq", - NULL - }; - const char **binary = paths; -diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c -index ca2f9dc..ce718d0 100644 ---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c -+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c -@@ -170,9 +170,7 @@ static inline const char * - nm_find_dnsmasq (void) - { - static const char *dnsmasq_binary_paths[] = { -- "/usr/local/sbin/dnsmasq", -- "/usr/sbin/dnsmasq", -- "/sbin/dnsmasq", -+ "@dnsmasq@/bin/dnsmasq", - NULL - }; - diff --git a/src/nm-device.c b/src/nm-device.c index 1dc94ee..e60f3c8 100644 --- a/src/nm-device.c @@ -77,7 +47,7 @@ index 1dc94ee..e60f3c8 100644 for (iter = modules; *iter; iter++) { - char *argv[3] = { "/sbin/modprobe", *iter, NULL }; -+ char *argv[3] = { "/var/run/current-system/sw/sbin/modprobe", *iter, NULL }; ++ char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL }; char *envp[1] = { NULL }; GError *error = NULL; @@ -101,7 +71,7 @@ index 59698c3..7dba0f7 100644 /* Make sure /dev/ppp exists (bgo #533064) */ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) - ignored = system ("/sbin/modprobe ppp_generic"); -+ ignored = system ("/var/run/current-system/sw/sbin/modprobe ppp_generic"); ++ ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic"); connection = nm_act_request_get_connection (req); g_assert (connection); |