Merge authors: Loïc Minier (lool) Related merge proposals: https://code.launchpad.net/~lool/upstart/document-stop-in-pre-start/+merge/95818 proposed by: Loïc Minier (lool) review: Approve - James Hunt (jamesodhunt) ------------------------------------------------------------ revno: 1373 [merge] committer: James Hunt <[email protected]> branch nick: upstart timestamp: Tue 2012-07-31 10:17:31 +0100 message: Document calls to 'stop' and 'start' with no arguments in pre-start/pre-stop stanzas. modified: init/man/init.5 util/man/initctl.8
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'init/man/init.5' --- init/man/init.5 2012-03-16 09:03:02 +0000 +++ init/man/init.5 2012-07-31 09:17:31 +0000 @@ -195,7 +195,10 @@ This process will be run after the job's .BR starting (7) event has finished, but before the main process is run. It is typically -used to prepare the environment, such as making necessary directories. +used to prepare the environment, such as making necessary directories, +and it may also call the +.BR stop (8) +command without arguments to cancel the start. .\" .TP .B post\-start exec\fR|\fBscript\fR... === modified file 'util/man/initctl.8' --- util/man/initctl.8 2012-03-25 19:29:51 +0000 +++ util/man/initctl.8 2012-07-31 09:17:31 +0000 @@ -145,6 +145,13 @@ If the job is already running, .B start will return an error. + +When called from the +.IR pre\-stop +stanza of a job configuration, +.B start +may be called without argument to cancel the +.B stop. .\" .TP .B stop @@ -161,6 +168,13 @@ for a description of the output format and .B start for a discussion on instances. + +When called from the +.IR pre\-start +stanza of a job configuration, +.B stop +may be called without an argument to cancel the +.B start. .\" .TP .B restart
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
