From aaac043ae57e1219aee40737fd1e0242ed9af71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 24 Dec 2009 12:05:34 +0000
Subject: [PATCH] Making an explicit dependency for nfs-kernel on portmap

svn path=/nixos/trunk/; revision=19090
---
 modules/services/network-filesystems/nfs-kernel.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 2f6904457b2..249d777727e 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -71,6 +71,11 @@ in
 
   config = mkIf config.services.nfsKernel.enable {
 
+    assertions = singleton
+      { assertion = config.services.portmap.enable;
+        message = "Please enable portmap (services.portmap.enable) to use nfs-kernel.";
+      };
+
     environment.etc = singleton
       { source = exports;
         target = "exports";
@@ -111,7 +116,7 @@ in
 
         description = "Kernel NFS server";
 
-        startOn = "started nfs-kernel-exports";
+        startOn = "started nfs-kernel-exports and started portmap";
         stopOn = "stopping nfs-kernel-exports";
 
         exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
@@ -122,7 +127,7 @@ in
 
         description = "Kernel NFS server - mount daemon";
 
-        startOn = "started nfs-kernel-nfsd";
+        startOn = "started nfs-kernel-nfsd and started portmap";
         stopOn = "stopping nfs-kernel-exports";
 
         exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
@@ -133,8 +138,8 @@ in
       
         description = "Kernel NFS server - Network Status Monitor";
       
-        startOn = "started nfs-kernel-nfsd";
-	stopOn = "stopping nfs-kernel-exports";
+        startOn = "started nfs-kernel-nfsd and started portmap";
+        stopOn = "stopping nfs-kernel-exports";
 
         preStart =
           ''