Author: eelco
Date: 2010-06-09 11:15:25 +0000 (Wed, 09 Jun 2010)
New Revision: 22192

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22192&view=rev

Modified:
   nixos/branches/boot-order/modules/services/networking/portmap.nix

Log:
* portmap: don't use the -f flag to ensure that when the job reaches
  the "started" state, portmap is actually up.


Changes:

Modified: nixos/branches/boot-order/modules/services/networking/portmap.nix
===================================================================
--- nixos/branches/boot-order/modules/services/networking/portmap.nix   
2010-06-09 10:51:05 UTC (rev 22191)
+++ nixos/branches/boot-order/modules/services/networking/portmap.nix   
2010-06-09 11:15:25 UTC (rev 22192)
@@ -54,7 +54,7 @@
     users.extraUsers = singleton
       { name = "portmap";
         inherit uid;
-        description = "portmap daemon user";
+        description = "Portmap daemon user";
         home = "/var/empty";
       };
 
@@ -66,14 +66,15 @@
     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 ""}
           '';
       };

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to