From 4ae7819c3943b65132db292544afba998105bd2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Mar 2012 13:01:06 +0000
Subject: [PATCH] * The idmapd job requires the sunrpc kernel module to be
 loaded.   (http://hydra.nixos.org/build/2315397)

svn path=/nixos/trunk/; revision=33358
---
 modules/tasks/filesystems/nfs.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 740a3b6e4473..d916811050e5 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -39,6 +39,8 @@ in
     
     system.fsPackages = [ pkgs.nfsUtils ];
 
+    boot.kernelModules = [ "sunrpc" ];
+
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd
@@ -77,11 +79,11 @@ in
       };
 
     jobs.idmapd =
-      { description = "Kernel NFS server - ID Map Daemon";
+      { description = "NFS ID mapping daemon";
 
         path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
 
-        stopOn = "starting shutdown";
+        startOn = "started udev";
 
         preStart =
           ''