Merge lp:~jamesodhunt/upstart/quiesce-cleanup-fix into lp:upstart

[James Hunt]

* 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.

[Dimitri John Ledkov (xnox)]

lgtm =)

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-07-25 19:44:38 +0000
+++ ChangeLog	2013-07-31 09:32:42 +0000
@@ -1,3 +1,9 @@
[phone]  James Hunt  <[e-mail]>
+
+	* 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  <[e-mail]>
 
 	* 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);
 }