From 2df81f42a51810d21e1d9771a1f85303f67228ee Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickard.nilsson@telia.com>
Date: Wed, 9 May 2012 22:06:17 +0000
Subject: [PATCH] Moved idmapd configuration file to Nix store.

svn path=/nixos/trunk/; revision=34037
---
 modules/tasks/filesystems/nfs.nix | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index d916811050e..0f48249b365 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -10,22 +10,19 @@ let
 
   rpcMountpoint = "${nfsStateDir}/rpc_pipefs";
 
-  idmapdConfFile = {
-    target = "idmapd.conf";
-    source = pkgs.writeText "idmapd.conf" ''
-      [General]
-      Pipefs-Directory = ${rpcMountpoint}
-      ${optionalString (config.networking.domain != "")
-        "Domain = ${config.networking.domain}"}
+  idmapdConfFile = pkgs.writeText "idmapd.conf" ''
+    [General]
+    Pipefs-Directory = ${rpcMountpoint}
+    ${optionalString (config.networking.domain != "")
+      "Domain = ${config.networking.domain}"}
 
-      [Mapping]
-      Nobody-User = nobody
-      Nobody-Group = nogroup
+    [Mapping]
+    Nobody-User = nobody
+    Nobody-Group = nogroup
 
-      [Translation]
-      Method = nsswitch
-    '';
-  };
+    [Translation]
+    Method = nsswitch
+  '';
 
 in
 
@@ -99,7 +96,7 @@ in
 
         daemonType = "fork";
 
-        exec = "rpc.idmapd";
+        exec = "rpc.idmapd -v -c ${idmapdConfFile}";
       };
 
   };