James Hunt has proposed merging lp:~jamesodhunt/upstart/quiesce-cleanup-fix into lp:upstart.
Requested reviews: Upstart Reviewers (upstart-reviewers) For more details, see: https://code.launchpad.net/~jamesodhunt/upstart/quiesce-cleanup-fix/+merge/177778 * init/quiesce.c: quiesce_finalise(): Move cleanup to main() since the NIH main loop may be iterated once more before shutdown. This may be a possible fix for bug 1205443 and bug 1202287. -- https://code.launchpad.net/~jamesodhunt/upstart/quiesce-cleanup-fix/+merge/177778 Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/quiesce-cleanup-fix into lp:upstart.
=== modified file 'ChangeLog' --- ChangeLog 2013-07-25 19:44:38 +0000 +++ ChangeLog 2013-07-31 09:32:42 +0000 @@ -1,3 +1,9 @@ +2013-07-31 James Hunt <[email protected]> + + * init/quiesce.c: quiesce_finalise(): Move cleanup to main() + since the NIH main loop may be iterated once more before + shutdown. + 2013-07-25 James Hunt <[email protected]> * extra/Makefile.am: Renamed to upstart-local-bridge. === modified file 'init/main.c' --- init/main.c 2013-07-19 13:24:20 +0000 +++ init/main.c 2013-07-31 09:32:42 +0000 @@ -683,6 +683,11 @@ nih_main_loop_interrupt (); ret = nih_main_loop (); + /* Cleanup */ + conf_destroy (); + session_destroy (); + control_cleanup (); + return ret; } === modified file 'init/quiesce.c' --- init/quiesce.c 2013-06-21 12:36:52 +0000 +++ init/quiesce.c 2013-07-31 09:32:42 +0000 @@ -232,17 +232,12 @@ /** * quiesce_finalise: * - * Perform final shutdown operations. + * Request shutdown. **/ void quiesce_finalise (void) { nih_assert (quiesce_phase == QUIESCE_PHASE_CLEANUP); - /* Cleanup */ - conf_destroy (); - session_destroy (); - control_cleanup (); - nih_main_loop_exit (0); }
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
