Author: eelco Date: Fri Mar 16 17:43:18 2012 New Revision: 33167 URL: https://nixos.org/websvn/nix/?rev=33167&sc=1
Log: * nfsd and statd do not need to be stopped when portmap stops. Modified: nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix nixos/trunk/modules/services/networking/portmap.nix Modified: nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix ============================================================================== --- nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix Fri Mar 16 17:42:14 2012 (r33166) +++ nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix Fri Mar 16 17:43:18 2012 (r33167) @@ -10,19 +10,6 @@ exports = pkgs.writeText "exports" cfg.server.exports; -/* - Description at http://nfs.sourceforge.net/nfs-howto/ar01s03.html : - - "If your distribution does not include them in the startup scripts, then then - you should add them, configured to start in the following order: - - rpc.portmap - rpc.mountd, rpc.nfsd - rpc.statd, rpc.lockd (if necessary), and - rpc.rquotad" -*/ - - in { @@ -106,7 +93,7 @@ { description = "Kernel NFS server"; startOn = "started portmap"; - stopOn = "stopped statd or stopping portmap"; + stopOn = "stopped statd"; preStart = '' @@ -166,7 +153,7 @@ "started mountd and started nfsd" else "started portmap"; - stopOn = "stopping nfsd or stopping portmap"; + stopOn = "stopping nfsd"; preStart = '' Modified: nixos/trunk/modules/services/networking/portmap.nix ============================================================================== --- nixos/trunk/modules/services/networking/portmap.nix Fri Mar 16 17:42:14 2012 (r33166) +++ nixos/trunk/modules/services/networking/portmap.nix Fri Mar 16 17:43:18 2012 (r33167) @@ -51,6 +51,8 @@ config = mkIf config.services.portmap.enable { + environment.systemPackages = [ portmap ]; + users.extraUsers = singleton { name = "portmap"; inherit uid; _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
