about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-07 14:06:19 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-07 14:15:57 +0200
commit58b028f9ee24dc403ee83ee744bfa1cf859960a8 (patch)
tree1f381c87acc645d6730c3543e83a47bf0c9500a8 /nixos
parent015c984537990d0f8d89b8f5a2e53f516caa5b94 (diff)
downloadnixlib-58b028f9ee24dc403ee83ee744bfa1cf859960a8.tar
nixlib-58b028f9ee24dc403ee83ee744bfa1cf859960a8.tar.gz
nixlib-58b028f9ee24dc403ee83ee744bfa1cf859960a8.tar.bz2
nixlib-58b028f9ee24dc403ee83ee744bfa1cf859960a8.tar.lz
nixlib-58b028f9ee24dc403ee83ee744bfa1cf859960a8.tar.xz
nixlib-58b028f9ee24dc403ee83ee744bfa1cf859960a8.tar.zst
nixlib-58b028f9ee24dc403ee83ee744bfa1cf859960a8.zip
nfs module: Fix dependency on statd and idmapd
http://hydra.nixos.org/build/40038016
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/tasks/filesystems/nfs.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index f3b3470cd12e..e9a7ccc721a9 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -70,13 +70,16 @@ in
 
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
 
+    # FIXME: should use upstream units from nfs-utils.
+
     systemd.services.statd =
       { description = "NFSv3 Network Status Monitor";
 
         path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];
 
-        wantedBy = [ "remote-fs-pre.target" ];
+        wants = [ "remote-fs-pre.target" ];
         before = [ "remote-fs-pre.target" ];
+        wantedBy = [ "remote-fs.target" ];
         requires = [ "basic.target" "rpcbind.service" ];
         after = [ "basic.target" "rpcbind.service" ];
 
@@ -102,8 +105,9 @@ in
 
         path = [ pkgs.sysvtools pkgs.utillinux ];
 
-        wantedBy = [ "remote-fs-pre.target" ];
+        wants = [ "remote-fs-pre.target" ];
         before = [ "remote-fs-pre.target" ];
+        wantedBy = [ "remote-fs.target" ];
         requires = [ "rpcbind.service" ];
         after = [ "rpcbind.service" ];