Author: rickynils
Date: Wed May 9 22:06:17 2012
New Revision: 34037
URL: https://nixos.org/websvn/nix/?rev=34037&sc=1
Log:
Moved idmapd configuration file to Nix store.
Modified:
nixos/trunk/modules/tasks/filesystems/nfs.nix
Modified: nixos/trunk/modules/tasks/filesystems/nfs.nix
==============================================================================
--- nixos/trunk/modules/tasks/filesystems/nfs.nix Wed May 9 21:49:39
2012 (r34036)
+++ nixos/trunk/modules/tasks/filesystems/nfs.nix Wed May 9 22:06:17
2012 (r34037)
@@ -10,22 +10,19 @@
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}"}
-
- [Mapping]
- Nobody-User = nobody
- Nobody-Group = nogroup
-
- [Translation]
- Method = nsswitch
- '';
- };
+ idmapdConfFile = pkgs.writeText "idmapd.conf" ''
+ [General]
+ Pipefs-Directory = ${rpcMountpoint}
+ ${optionalString (config.networking.domain != "")
+ "Domain = ${config.networking.domain}"}
+
+ [Mapping]
+ Nobody-User = nobody
+ Nobody-Group = nogroup
+
+ [Translation]
+ Method = nsswitch
+ '';
in
@@ -99,7 +96,7 @@
daemonType = "fork";
- exec = "rpc.idmapd";
+ exec = "rpc.idmapd -v -c ${idmapdConfFile}";
};
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
