From 21ef8d5c89281a71750cdf51ef7c8d69c52b63ed Mon Sep 17 00:00:00 2001 From: montag451 Date: Thu, 6 Jul 2017 15:14:01 +0200 Subject: [PATCH] network-manager: fix hard-coded path for modprobe --- pkgs/tools/networking/network-manager/default.nix | 4 +++- pkgs/tools/networking/network-manager/modprobe.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/network-manager/modprobe.patch diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 3ef4188052b..d2a51b3acc8 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { --replace /usr/bin/ping6 ${inetutils}/bin/ping substituteInPlace src/devices/nm-arping-manager.c \ --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);' - substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ @@ -43,6 +42,8 @@ stdenv.mkDerivation rec { --replace /bin/kill ${coreutils}/bin/kill substituteInPlace clients/common/nm-vpn-helpers.c \ --subst-var-by openconnect ${openconnect} + substituteInPlace src/nm-core-utils.c \ + --subst-var-by modprobeBinPath ${kmod}/bin/modprobe # to enable link-local connections configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" ''; @@ -79,6 +80,7 @@ stdenv.mkDerivation rec { url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch"; }) ./openconnect_helper_path.patch + ./modprobe.patch ]; buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp diff --git a/pkgs/tools/networking/network-manager/modprobe.patch b/pkgs/tools/networking/network-manager/modprobe.patch new file mode 100644 index 00000000000..487c70b0165 --- /dev/null +++ b/pkgs/tools/networking/network-manager/modprobe.patch @@ -0,0 +1,11 @@ +--- a/src/nm-core-utils.c 2017-02-15 13:10:27.000000000 +0100 ++++ b/src/nm-core-utils.c 2017-07-06 14:28:41.575815695 +0200 +@@ -419,7 +419,7 @@ + + /* construct the argument list */ + argv = g_ptr_array_sized_new (4); +- g_ptr_array_add (argv, "/sbin/modprobe"); ++ g_ptr_array_add (argv, "@modprobeBinPath@"); + g_ptr_array_add (argv, (char *) arg1); + + va_start (ap, arg1);