diff options
| author | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
| commit | 9adad8612b082bcbae30c81678a04b79a44079a4 (patch) | |
| tree | 6814d056ee2960d122842dc9c830bb411c40d5ff /pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch | |
| parent | 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1 (diff) | |
| download | nixlib-9adad8612b082bcbae30c81678a04b79a44079a4.tar nixlib-9adad8612b082bcbae30c81678a04b79a44079a4.tar.gz nixlib-9adad8612b082bcbae30c81678a04b79a44079a4.tar.bz2 nixlib-9adad8612b082bcbae30c81678a04b79a44079a4.tar.lz nixlib-9adad8612b082bcbae30c81678a04b79a44079a4.tar.xz nixlib-9adad8612b082bcbae30c81678a04b79a44079a4.tar.zst nixlib-9adad8612b082bcbae30c81678a04b79a44079a4.zip | |
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
Diffstat (limited to 'pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch')
| -rw-r--r-- | pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch index 9ebc080ba96f..831b2010fcfc 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch @@ -47,7 +47,7 @@ index 1dc94ee..e60f3c8 100644 for (iter = modules; *iter; iter++) { - char *argv[3] = { "/sbin/modprobe", *iter, NULL }; -+ char *argv[3] = { "@kmod@/bin/modprobe", *iter, NULL }; ++ char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL }; char *envp[1] = { NULL }; GError *error = NULL; @@ -71,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 ("@kmod@/bin/modprobe ppp_generic"); ++ ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic"); connection = nm_act_request_get_connection (req); g_assert (connection); |