Author: eelco
Date: Mon Jul 12 15:14:26 2010
New Revision: 22562
URL: https://svn.nixos.org/websvn/nix/?rev=22562&sc=1
Log:
* Don't use "starting" events because they basically don't work - they
cause restarting of jobs to hang indefinitely because the required
"start on" condition never triggers.
For instance, after "stop nfs-kernel-nfsd", "start nfs-kernel-nfsd"
will hang until we do "stop portmap; start portmap". This is due to
the "starting nfs-kernel-nfsd and started portmap" condition in
the nfs-kernel-mountd job. Apparently, because portmap is already
running, the condition "started portmap" never happens because no
event is emitted.
Modified:
nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix
Modified: nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix
==============================================================================
--- nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix Mon Jul
12 13:42:59 2010 (r22561)
+++ nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix Mon Jul
12 15:14:26 2010 (r22562)
@@ -96,7 +96,6 @@
description = "Kernel NFS server";
startOn = "started network-interfaces";
- stopOn = "stopping network-interfaces";
preStart =
''
@@ -131,7 +130,7 @@
description = "Kernel NFS server";
- startOn = "started nfs-kernel-exports and started portmap";
+ startOn = "started nfs-kernel-exports and started
nfs-kernel-mountd and started nfs-kernel-statd and started portmap";
stopOn = "stopping nfs-kernel-exports";
preStart = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if
cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""}
${builtins.toString cfg.server.nproc}";
@@ -146,7 +145,7 @@
description = "Kernel NFS server - mount daemon";
- startOn = "starting nfs-kernel-nfsd and started portmap";
+ startOn = "started portmap";
stopOn = "stopped nfs-kernel-nfsd";
daemonType = "fork";
@@ -161,7 +160,7 @@
description = "Kernel NFS server - Network Status Monitor";
- startOn = "started portmap" + optionalString cfg.server.enable "
and starting nfs-kernel-nfsd";
+ startOn = "started portmap";
stopOn = "never";
preStart =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
