------------------------------------------------------------
revno: 1544
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Wed 2013-10-23 14:10:16 +0100
message:
  * util/initctl.h: IS_INIT_EVENT(): Ignore session end event when
    running in user mode (for 'check-config').
modified:
  ChangeLog
  util/initctl.h


--
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 'ChangeLog'
--- ChangeLog	2013-10-04 21:34:25 +0000
+++ ChangeLog	2013-10-23 13:10:16 +0000
@@ -1,4 +1,9 @@
-2013-01-04  Steve Langasek  <[email protected]
+2013-10-23  James Hunt  <[email protected]>
+
+	* util/initctl.h: IS_INIT_EVENT(): Ignore session end event when
+	  running in user mode (for 'check-config').
+
+2013-10-04  Steve Langasek  <[email protected]
 
 	* extra/upstart-local-bridge.c: use SOCKET_PATH in our event
 	  environment, instead of clobbering PATH.  (LP: #1235480)

=== modified file 'util/initctl.h'
--- util/initctl.h	2011-06-01 13:20:49 +0000
+++ util/initctl.h	2013-10-23 13:10:16 +0000
@@ -123,13 +123,14 @@
  * production versus debug builds (STARTUP_EVENT changes name depending
  * on build type).
  **/
-#define IS_INIT_EVENT(token)                  \
-	(!strcmp (token, STARTUP_EVENT)    || \
-	 !strcmp (token, "debug")          || \
-	 !strcmp (token, "startup")        || \
-	 !strcmp (token, CTRLALTDEL_EVENT) || \
-	 !strcmp (token, KBDREQUEST_EVENT) || \
-	 !strcmp (token, PWRSTATUS_EVENT)  || \
+#define IS_INIT_EVENT(token)                                  \
+	(!strcmp (token, STARTUP_EVENT)                    || \
+	 !strcmp (token, "debug")                          || \
+	 !strcmp (token, "startup")                        || \
+	 !strcmp (token, CTRLALTDEL_EVENT)                 || \
+	 !strcmp (token, KBDREQUEST_EVENT)                 || \
+	 !strcmp (token, PWRSTATUS_EVENT)                  || \
+	 (!strcmp (token, SESSION_END_EVENT) && user_mode) || \
 	 IS_JOB_EVENT (token))
 
 /**

-- 
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/upstart-devel

Reply via email to