diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-14 13:00:52 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-19 17:56:49 +0300 |
| commit | 5ff6e98486adb1a3ff3f705bdc43216d3a885d73 (patch) | |
| tree | e8e36c540e783fec13775b2a68ba72e7d1881e3d /nixos/modules/services | |
| parent | ff227057931f5977352f7583b00f9d1f8cf43da5 (diff) | |
| download | nixpkgs-5ff6e98486adb1a3ff3f705bdc43216d3a885d73.tar nixpkgs-5ff6e98486adb1a3ff3f705bdc43216d3a885d73.tar.gz nixpkgs-5ff6e98486adb1a3ff3f705bdc43216d3a885d73.tar.bz2 nixpkgs-5ff6e98486adb1a3ff3f705bdc43216d3a885d73.tar.lz nixpkgs-5ff6e98486adb1a3ff3f705bdc43216d3a885d73.tar.xz nixpkgs-5ff6e98486adb1a3ff3f705bdc43216d3a885d73.tar.zst nixpkgs-5ff6e98486adb1a3ff3f705bdc43216d3a885d73.zip | |
modprobe service: drop kmod wrapper
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/hardware/udev.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/fan.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/strongswan.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index e7741083d1a..fb44790ab1f 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -58,7 +58,7 @@ let # Fix some paths in the standard udev rules. Hacky. for i in $out/*.rules; do substituteInPlace $i \ - --replace \"/sbin/modprobe \"${config.system.sbin.modprobe}/sbin/modprobe \ + --replace \"/sbin/modprobe \"${pkgs.kmod}/bin/modprobe \ --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \ --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \ --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount \ diff --git a/nixos/modules/services/networking/fan.nix b/nixos/modules/services/networking/fan.nix index 3170567e5b4..7f4e3647832 100644 --- a/nixos/modules/services/networking/fan.nix +++ b/nixos/modules/services/networking/fan.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.networking.fan; - modprobe = "${config.system.sbin.modprobe}/sbin/modprobe"; + modprobe = "${pkgs.kmod}/bin/modprobe"; in diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index d6960a5df47..8778b0364f9 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -118,7 +118,7 @@ in systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ config.system.sbin.modprobe iproute iptables utillinux ]; # XXX Linux + path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux wants = [ "keys.target" ]; after = [ "network.target" "keys.target" ]; environment = { |