From e963fe2b2c9357c1f70b5afbc97db0340ef54df7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 20:23:45 +0000
Subject: [PATCH] * Forgot to commit.

svn path=/nixos/trunk/; revision=33173
---
 modules/tasks/filesystems.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 0be837dd464..39ccaeee209 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -172,25 +172,24 @@ in
       };
 
     jobs.mountall =
-      { startOn = "started udev"
-          # !!! The `started nfs-kernel-statd' condition shouldn't be
-          # here.  The `nfs-kernel-statd' job should have a `starting
-          # mountall' condition.  However, that doesn't work if
-          # `mountall' is restarted due to an apparent bug in Upstart:
-          # `mountall' hangs forever in the `start/starting' state.
-          + optionalString config.services.nfsKernel.client.enable " and started nfs-kernel-statd";
+      { startOn = "started udev";
 
         task = true;
 
-        path = [ pkgs.utillinux ] ++ config.system.fsPackages;
+        path = [ pkgs.utillinux pkgs.mountall ] ++ config.system.fsPackages;
 
         script =
           ''
             # Ensure that this job is restarted when fstab changed:
             # ${fstab}
+            
+            ${optionalString config.services.nfsKernel.client.enable ''
+              start statd || true
+            ''}
+            
             exec > /dev/console 2>&1
             echo "mounting filesystems..."
-            ${pkgs.mountall}/sbin/mountall
+            exec mountall
           '';
       };