public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Forgot to commit.

Browse Source 
svn path=/nixos/trunk/; revision=33173
This commit is contained in:
Eelco Dolstra 2012-03-16 20:23:45 +00:00
parent a395e46192
commit e963fe2b2c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/tasks/filesystems.nix
View File

@ -172,25 +172,24 @@ in
}; };
jobs.mountall = jobs.mountall =
{ startOn = "started udev" { 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";
task = true; task = true;
path = [ pkgs.utillinux ] ++ config.system.fsPackages; path = [ pkgs.utillinux pkgs.mountall ] ++ config.system.fsPackages;
script = script =
'' ''
# Ensure that this job is restarted when fstab changed: # Ensure that this job is restarted when fstab changed:
# ${fstab} # ${fstab}
${optionalString config.services.nfsKernel.client.enable ''
start statd || true
''}
exec > /dev/console 2>&1 exec > /dev/console 2>&1
echo "mounting filesystems..." echo "mounting filesystems..."
${pkgs.mountall}/sbin/mountall exec mountall
''; '';
}; };