From d837ae49141abb62368f749cb003966773414d52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 11:15:25 +0000
Subject: [PATCH] * portmap: don't use the -f flag to ensure that when the job
 reaches   the "started" state, portmap is actually up.

svn path=/nixos/branches/boot-order/; revision=22192
---
 modules/services/networking/portmap.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 62d1c459f105..eead1c52ff01 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -54,7 +54,7 @@ in
     users.extraUsers = singleton
       { name = "portmap";
         inherit uid;
-        description = "portmap daemon user";
+        description = "Portmap daemon user";
         home = "/var/empty";
       };
 
@@ -66,14 +66,15 @@ in
     jobs.portmap =
       { description = "ONC RPC portmap";
 
-        startOn = "ip-up";
+        startOn = "started network-interfaces";
+
+        daemonType = "fork";
 
         exec =
           ''
-            ${portmap}/sbin/portmap -f \
-              ${if config.services.portmap.chroot == ""
-                then ""
-                else "-t \"${config.services.portmap.chroot}\""} \
+            ${portmap}/sbin/portmap \
+              ${optionalString (config.services.portmap.chroot != "")
+                "-t '${config.services.portmap.chroot}'"} \
               ${if config.services.portmap.verbose then "-v" else ""}
           '';
       };