Author: eelco
Date: Tue Mar 20 10:17:08 2012
New Revision: 33288
URL: https://nixos.org/websvn/nix/?rev=33288&sc=1
Log:
* Emit "expect daemon" for the mountall task. Otherwise it may get a
USR1 signal before it has forked into the background (because it
will be in the start/running state immediately).
Modified:
nixos/trunk/modules/system/upstart/upstart.nix
Modified: nixos/trunk/modules/system/upstart/upstart.nix
==============================================================================
--- nixos/trunk/modules/system/upstart/upstart.nix Tue Mar 20 10:00:04
2012 (r33287)
+++ nixos/trunk/modules/system/upstart/upstart.nix Tue Mar 20 10:17:08
2012 (r33288)
@@ -116,13 +116,11 @@
end script
''}
- ${optionalString (!job.task) (
- if job.daemonType == "fork" then "expect fork" else
- if job.daemonType == "daemon" then "expect daemon" else
- if job.daemonType == "stop" then "expect stop" else
- if job.daemonType == "none" then "" else
- throw "invalid daemon type `${job.daemonType}'"
- )}
+ ${if job.daemonType == "fork" then "expect fork" else
+ if job.daemonType == "daemon" then "expect daemon" else
+ if job.daemonType == "stop" then "expect stop" else
+ if job.daemonType == "none" then "" else
+ throw "invalid daemon type `${job.daemonType}'"}
${optionalString (job.setuid != "") ''
setuid ${job.setuid}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
