Author: eelco
Date: Fri Mar 16 20:23:45 2012
New Revision: 33173
URL: https://nixos.org/websvn/nix/?rev=33173&sc=1
Log:
* Forgot to commit.
Modified:
nixos/trunk/modules/tasks/filesystems.nix
Modified: nixos/trunk/modules/tasks/filesystems.nix
==============================================================================
--- nixos/trunk/modules/tasks/filesystems.nix Fri Mar 16 20:10:14 2012
(r33172)
+++ nixos/trunk/modules/tasks/filesystems.nix Fri Mar 16 20:23:45 2012
(r33173)
@@ -172,25 +172,24 @@
};
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
'';
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
