Merge lp:~jamesodhunt/upstart/upstream-man-pages-updates into lp:upstart

[James Hunt]

Man page updates.

* init/man/init.5:
  - Quoted dashes.
  - Explain handling of duplicated stanzas.
  - "respawn": Document default count and interval.
  - "emits": Reference "initctl check-config".
  - Added BUGS section.
  - Added copyright.
* init/man/init.8:
  - Quoted dashes.
  - See Also: Added control-alt-delete(7).
* util/man/initctl.8:
  - Quoted dashes.
  - "restart": Clarified meaning.
  - "list": Explained "stop/waiting" jobs.

=== modified file 'ChangeLog'
--- ChangeLog	2011-05-12 20:42:28 +0000
+++ ChangeLog	2011-06-03 10:15:15 +0000
@@ -1,3 +1,162 @@
[phone]  James Hunt  <[e-mail]>
+
+	* contrib/bash_completion/upstart:
+	  - Made function names more meaningful:
+	  - _upstart_jobs: Now returns a unique list
+	  - _upstart_events (nee _upstart_named_events ) now considers all
+	    "emits" tokens.
+	  - Updates for "check-config" and "show-config".
+	  - Added "--session" option.
+	  - Added "--no-wait" for emit, reload and restart.
+
+	Man page updates.
+	
+	* init/man/init.5:
+	  - Quoted dashes.
+	  - Explain handling of duplicated stanzas.
+	  - "respawn": Document default count and interval.
+	  - "emits": Reference "initctl check-config".
+	  - Added BUGS section.
+	  - Added copyright.
+	* init/man/init.8:
+	  - Quoted dashes.
+	  - See Also: Added control-alt-delete(7).
+	* util/man/initctl.8:
+	  - Quoted dashes.
+	  - "restart": Clarified meaning.
+	  - "list": Explained "stop/waiting" jobs.
+
[phone]  James Hunt  <[e-mail]>
+
+	Add D-Bus session support to initctl.
+	
+	* util/initctl.c:
+	  - Added "--session" command-line option.
+	  - dbus_bus_type_setter(): New function used by option parser to
+	    distinguish system/session D-Bus bus type.
+	  - system_bus variable now replaced by two others: use_dbus (boolean)
+	    and dbus_bus_type.
+	  - upstart_open(): Updated to handle multiple D-Bus bus types.
+	* util/man/initctl.8: Update for "--session" option.
+	* util/tests/test_initctl.c: Updated to make use of use_dbus and
+	  dbus_bus_type rather than system_bus.
+
+	Add "show-config" command to initctl.
+	
+	* util/initctl.c:
+	  - New functions:
+	    - job_class_condition_handler(): Handler function to retrieve job conditions.
+	    - job_class_condition_err_handler(): Handler error function for
+	      job_class_condition_handler().
+	    - job_class_parse_events(): Convert RPN "start on" and "stop on" conditions to
+	      human-readable format.
+	    - job_class_show_emits(): Display events which job emits.
+	    - job_class_show_conditions(): Make D-Bus calls to retrieve "start on" and
+	      "stop on" conditions.
+	    - show_config_action: Handle "show-config" command..
+	* util/initctl.h: New file providing stack-handling functionality for
+	  RPN parsing for "show-config" command.
+	* util/Makefile.am: Added initctl.h to initctl_SOURCES.
+	* util/man/initctl.8: Updated for "show-config" command and associated
+	  options.
+	* util/tests/test_initctl.c:
+	  - New macros START_UPSTART, STOP_UPSTART, RUN_COMMAND, CREATE_FILE and DELETE_FILE.
+	    These are required since due to the introduction of the
+	    "show-config" initctl command, initctl is no longer solely a proxy
+	    to Upstart: it now has some intelligence (it parses the 
+	    "emits", "start on" and "stop on" conditions) and thus must be
+	    tested directly.
+	  - test_show_config(): New function to test "initctl show-config".
+	  - in_chroot(): New function to detect if tests are being run from
+	    within a chroot environment.
+	  - dbus_configured(): New function which performs a basic check to
+	    establish if D-Bus is configured correctly.
+	  - main(): Added call to test_show_config(), conditional on
+	    a non-chroot environment and a working D-Bus system.
+
+	Add "check-config" command to initctl.
+	
+	* util/initctl.c:
+	  - New functions:
+	    - allow_event(): Determine if specified event is erroneous or not.
+	      Handles globbing.
+	    - allow_job(): Determine if specified job is erroneous or not.
+	      Handles variables (such as instance variables).
+	    - check_condition(): High-level function to handle checking start
+	      on/stop on conditions.
+	    - check_config_action: Handler for "check-config" command.
+	    - display_check_errors(): Display errors from expression tree nodes
+	      that are in error.
+	    - eval_expr_tree(): Evaluate expression tree.
+	    - ignored_events_setter(): handler for '--ignore-events' command-line
+	      option for "check-config" command.
+	    - tree_filter(): Used for filtering expression tree nodes.
+	  - show_config_action(): Update for check-config mode.
+	  - job_class_parse_events(): Update for check-config mode.
+	  - job_class_show_emits(): Update for check-config mode.
+	* util/initctl.h:
+	  - Added structs for JobCondition, CheckConfigData and ExprNode.
+	  - New macros: MAKE_EXPR_NODE() and MAKE_JOB_CONDITION().
+	* util/tests/test_initctl.c:
+	  - test_check_config(): New function to test "initctl check-config".
+	  - main(): Added call to test_check_config(), conditional on
+	    a non-chroot environment and a working D-Bus system.
+	* util/man/initctl.8: Updated for "check-config" command and associated
+	  options.
+	* conf/rc-sysinit.conf: Added "emits" stanza, required by
+	"check-config".
+
+	Addition of initctl2dot script for visualisation.
+	
+	* Makefile.am: Added scripts directory.
+	* configure.ac: Updated AC_CONFIG_FILES for scripts/Makefile.
+	* scripts/Makefile.am: Makefile for scripts.
+	* scripts/initctl2dot.py: Python script to produce dot(1) graphs of
+	  "initctl show-config" output.
+	* scripts/man/initctl2dot.8: Man page for initctl2dot.py script.
+
+	Addition of init-checkconf script.
+	
+	* scripts/init-checkconf.sh: Script to determine if specified job
+	  config file is valid or not.
+	* scripts/man/init-checkconf.8: Man page for init-checkconf.sh.
+	* scripts/Makefile.am: Added init-checkconf script and man
+	  page.
+
[phone]  James Hunt  <[e-mail]>
+
+	Add command-line option to use D-Bus session bus (for testing).
+	
+	* init/control.c:
+	  - Added new boolean use_session_bus.
+	  - Updated comments.
+	  - control_handle_bus_type(): New function to allow selection of
+	    session bus via env var "UPSTART_USE_SESSION_BUS".
+	    Also logs use of session bus if use_session_bus set.
+	  - control_bus_open(): Now connects to either D-Bus system bus or session bus.
+	* init/control.h: New define for USE_SESSION_BUS_ENV.
+	* init/main.c: Addition of "--session" command-line option.
+	* init/man/init.8: Update for new "--session" command-line option.
+
+	* Corrected copyright notices.
+
+	Add option to allow alternate location for job config files.
+	
+	* init/main.c:
+	  - Added "--confdir <dir>" command-line option.
+	  - handle_confdir(): New function to select alternate confdir using env
+	    var "UPSTART_CONFDIR" or command-line option (for testing).
+	* init/paths.h: Added define for CONFDIR_ENV.
+	* init/man/init.8: Update for new "--confdir" command-line option.
+
+	Add ability to suppress initial event and/or change its name.
+	
+	* init/main.c: New command-line options: "--no-startup-event" and
+	  "--startup-event". If "--no-startup-event" specified, log message as a
+	  debug aid.
+	* init/man/init.8: Documentation for new command-line options:
+	  "--no-startup-event" and "--startup-event".
+
 2011-05-12  Marc - A. Dahlhaus  <[e-mail]>
 
 	* init/job_class.h (JobClass): Add kill signal member

=== modified file 'Makefile.am'
--- Makefile.am	2010-02-04 03:42:29 +0000
+++ Makefile.am	2011-06-03 10:15:15 +0000
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl dbus init util conf doc contrib po
+SUBDIRS = intl dbus init util conf doc contrib po scripts
 
 EXTRA_DIST = HACKING
 

=== modified file 'conf/rc-sysinit.conf'
--- conf/rc-sysinit.conf	2010-02-04 03:59:06 +0000
+++ conf/rc-sysinit.conf	2011-06-03 10:15:15 +0000
@@ -13,6 +13,8 @@
 # or by faking an old /etc/inittab entry
 env DEFAULT_RUNLEVEL=2
 
+emits runlevel
+
 # There can be no previous runlevel here, but there might be old
 # information in /var/run/utmp that we pick up, and we don't want
 # that.

=== modified file 'configure.ac'
--- configure.ac	2011-03-22 17:53:17 +0000
+++ configure.ac	2011-06-03 10:15:15 +0000
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.61)
 AC_INIT([upstart], [1.3], [[e-mail]])
-NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Google Inc., Canonical Ltd.]])
+NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Canonical Ltd.]])
 AC_CONFIG_SRCDIR([init/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -64,6 +64,7 @@
 
 AC_CONFIG_FILES([ Makefile intl/Makefile
 		  dbus/Makefile init/Makefile util/Makefile conf/Makefile
-		  doc/Makefile contrib/Makefile po/Makefile.in ])
+		  doc/Makefile contrib/Makefile po/Makefile.in
+		  scripts/Makefile ])
 AC_CONFIG_HEADERS([config.h])
 AC_OUTPUT

=== modified file 'contrib/bash_completion/upstart'
--- contrib/bash_completion/upstart	2010-12-21 13:54:49 +0000
+++ contrib/bash_completion/upstart	2011-06-03 10:15:15 +0000
@@ -3,26 +3,28 @@
 #
 # We don't provide completion for 'init' itself for obvious reasons.
 have initctl &&
-_upstart_conf_events()
-{
-  initctl list|awk '{print $1}'
-} &&
-_upstart_named_events()
-{
-  (cd /etc/init && grep '^emits ' *.conf|sed 's/^emits //g')
-} &&
-_upstart_events()
-{
-  (_upstart_conf_events;_upstart_named_events)|tr ' ' '\n'|sort -u
-} &&
-_upstart_startable_events()
+_upstart_jobs()
+{
+  initctl list|awk '{print $1}'|sort -u
+} &&
+_upstart_startable_jobs()
 {
   initctl list|cut -d\, -f1|awk '$2 == "stop/waiting" {print $1}'
 } &&
-_upstart_stoppable_events()
+_upstart_stoppable_jobs()
 {
   initctl list|cut -d\, -f1|awk '$2 == "start/running" {print $1}'
 } &&
+_upstart_events()
+{
+  # note that we don't provide the internal events such as "starting"
+  # (and those from mountall) since the user should be using the
+  # associated command to emit such events.
+  (cd /etc/init && \
+   egrep '^[[:space:]]*emits ' *.conf |\
+   cut -d: -f2- | sed 's/^[[:space:]]*emits //g' |\
+   tr ' ' '\n' | awk '{print $NF}' | grep -v ^$|sort -u)
+} &&
 _upstart_initctl()
 {
   _get_comp_words_by_ref cur prev
@@ -32,34 +34,92 @@
   case "$prev" in
 
     start)
-      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_startable_events)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_startable_jobs)" -- ${cur}) )
       return 0
     ;;
 
     stop)
-      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_stoppable_events)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_stoppable_jobs)" -- ${cur}) )
       return 0
     ;;
 
     emit)
-      COMPREPLY=( $(compgen -W "$(_upstart_events)" -- ${cur}) )
-      return 0
-    ;;
-
-    reload|restart|status)
-      COMPREPLY=( $(compgen -W "$(_upstart_conf_events)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_events)" -- ${cur}) )
+      return 0
+    ;;
+
+    -i|--ignore-events)
+      # handle visualisation options after check-config command
+      for cmd in check-config
+      do
+        cwords=${COMP_WORDS[@]##}
+        filtered_cwords=${COMP_WORDS[@]##${cmd}}
+        if [ "$filtered_cwords" != "$cwords" ]
+        then
+          COMPREPLY=( $(compgen -W "$(_upstart_jobs)" -- ${cur}) )
+          return 0
+        fi
+      done
+    ;;
+
+    -e|--enumerate)
+      # handle visualisation options after show-config command
+      for cmd in show-config
+      do
+        cwords=${COMP_WORDS[@]##}
+        filtered_cwords=${COMP_WORDS[@]##${cmd}}
+        if [ "$filtered_cwords" != "$cwords" ]
+        then
+          COMPREPLY=( $(compgen -W "$(_upstart_jobs)" -- ${cur}) )
+          return 0
+        fi
+      done
+    ;;
+
+    reload|restart)
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_stoppable_jobs)" -- ${cur}) )
+      return 0
+    ;;
+
+    status)
+      COMPREPLY=( $(compgen -W "$(_upstart_jobs)" -- ${cur}) )
+      return 0
+    ;;
+
+    check-config)
+      COMPREPLY=( $(compgen -W "-w --warn -i --ignore-events= $(_upstart_jobs)" -- ${cur}) )
+      return 0
+    ;;
+    show-config)
+      COMPREPLY=( $(compgen -W "-e --enumerate $(_upstart_jobs)" -- ${cur}) )
       return 0
     ;;
 
     -n|--no-wait)
-      # allow no wait after start/stop commands
-      for cmd in start stop
+      # allow 'no wait' for certain commands
+      for cmd in start stop restart emit
       do
         cwords=${COMP_WORDS[@]##}
         filtered_cwords=${COMP_WORDS[@]##${cmd}}
         if [ "$filtered_cwords" != "$cwords" ]
         then
-          COMPREPLY=( $(compgen -W "$(_upstart_${cmd}able_events)" -- ${cur}) )
+          case "$cmd" in
+            start)
+              COMPREPLY=( $(compgen -W "$(_upstart_startable_jobs)" -- ${cur}) )
+            ;;
+
+            stop)
+              COMPREPLY=( $(compgen -W "$(_upstart_stoppable_jobs)" -- ${cur}) )
+            ;;
+
+            restart)
+              COMPREPLY=( $(compgen -W "$(_upstart_stoppable_jobs)" -- ${cur}) )
+            ;;
+
+            emit)
+              COMPREPLY=( $(compgen -W "$(_upstart_events)" -- ${cur}) )
+            ;;
+          esac
           return 0
         fi
       done
@@ -71,7 +131,7 @@
     ;;
   esac
 
-  opts="--help --version -q --quiet -v --verbose --system --dest="
+  opts="--help --version -q --quiet -v --verbose --session --system --dest="
   cmds=$(initctl help|grep "^  [^ ]"|awk '{print $1}')
 
   COMPREPLY=( $(compgen -W "${opts} ${cmds}" -- ${cur}) )
@@ -84,7 +144,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest= \
+  opts="--help --version -q --quiet -v --verbose --session --system --dest= \
         -n --no-wait"
 
   case "$prev" in
@@ -94,7 +154,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_startable_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_startable_jobs)" -- ${cur}) )
   return 0
 } && complete -F _upstart_start start
 
@@ -104,7 +164,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest= \
+  opts="--help --version -q --quiet -v --verbose --session --system --dest= \
         -n --no-wait"
 
   case "$prev" in
@@ -114,7 +174,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_jobs)" -- ${cur}) )
   return 0
 } && complete -F _upstart_stop stop
 
@@ -124,7 +184,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest= \
+  opts="--help --version -q --quiet -v --verbose --session --system --dest= \
         -n --no-wait"
 
   case "$prev" in
@@ -134,7 +194,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_jobs)" -- ${cur}) )
   return 0
 
 } && complete -F _upstart_restart restart
@@ -145,7 +205,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest="
+  opts="--help --version -q -d --detail -e --enumerate --quiet -v --verbose --session --system --dest="
 
   case "$prev" in
     --help|--version)
@@ -154,7 +214,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_jobs)" -- ${cur}) )
   return 0
 
 } && complete -F _upstart_status status
@@ -165,7 +225,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest="
+  opts="--help --version -q --quiet -v --verbose --session --system --dest="
 
   case "$prev" in
     --help|--version)
@@ -174,7 +234,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_jobs)" -- ${cur}) )
   return 0
 
 } && complete -F _upstart_reload reload

=== modified file 'dbus/upstart.h'
--- dbus/upstart.h	2010-12-10 04:04:51 +0000
+++ dbus/upstart.h	2011-06-03 10:15:15 +0000
@@ -31,7 +31,7 @@
 #  define DBUS_SERVICE_UPSTART "com.ubuntu.TestUpstart"
 # else
 #  define DBUS_SERVICE_UPSTART "com.ubuntu.Upstart"
-#endif
+# endif
 #endif
 
 

=== modified file 'init/conf.c'
--- init/conf.c	2011-03-15 18:44:09 +0000
+++ init/conf.c	2011-06-03 10:15:15 +0000
@@ -2,7 +2,6 @@
  *
  * conf.c - configuration management
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/control.c'
--- init/control.c	2009-07-11 11:47:12 +0000
+++ init/control.c	2011-06-03 10:15:15 +0000
@@ -2,7 +2,7 @@
  *
  * control.c - D-Bus connections, objects and methods
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -54,12 +54,19 @@
 
 #include "com.ubuntu.Upstart.h"
 
-
 /* Prototypes for static functions */
 static int   control_server_connect (DBusServer *server, DBusConnection *conn);
 static void  control_disconnected   (DBusConnection *conn);
 static void  control_register_all   (DBusConnection *conn);
 
+/**
+ * use_session_bus:
+ *
+ * If TRUE, connect to the D-Bus sessio bus rather than the system bus.
+ *
+ * Used for testing.
+ **/
+int use_session_bus = FALSE;
 
 /**
  * control_server_address:
@@ -78,7 +85,7 @@
 /**
  * control_bus:
  *
- * Open connection to D-Bus system bus.  The connection may be opened with
+ * Open connection to a D-Bus bus.  The connection may be opened with
  * control_bus_open() and if lost will become NULL.
  **/
 DBusConnection *control_bus = NULL;
@@ -86,7 +93,7 @@
 /**
  * control_conns:
  *
- * Open control connections, including the connection to the D-Bus system
+ * Open control connections, including the connection to a D-Bus
  * bus and any private client connections.
  **/
 NihList *control_conns = NULL;
@@ -190,8 +197,9 @@
 /**
  * control_bus_open:
  *
- * Open a connection to the D-Bus system bus and store it in the control_bus
- * global.  The connection is handled automatically in the main loop.
+ * Open a connection to the appropriate D-Bus bus and store it in the
+ * control_bus global. The connection is handled automatically
+ * in the main loop.
  *
  * Returns: zero on success, negative value on raised error.
  **/
@@ -207,10 +215,13 @@
 
 	control_init ();
 
+	control_handle_bus_type ();
+
 	/* Connect to the D-Bus System Bus and hook everything up into
 	 * our own main loop automatically.
 	 */
-	conn = nih_dbus_bus (DBUS_BUS_SYSTEM, control_disconnected);
+	conn = nih_dbus_bus (use_session_bus ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM,
+			     control_disconnected);
 	if (! conn)
 		return -1;
 
@@ -669,3 +680,18 @@
 
 	return 0;
 }
+
+/**
+ * control_handle_bus_type:
+ *
+ * Determine D-Bus bus type to connect to.
+ **/
+void
+control_handle_bus_type (void)
+{
+	if (getenv (USE_SESSION_BUS_ENV))
+		use_session_bus = TRUE;
+
+	if (use_session_bus)
+		nih_debug ("Using session bus");
+}

=== modified file 'init/control.h'
--- init/control.h	2009-07-09 08:36:52 +0000
+++ init/control.h	2011-06-03 10:15:15 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,18 @@
 #include <nih-dbus/dbus_connection.h>
 #include <nih-dbus/dbus_message.h>
 
+/**
+ * USE_SESSION_BUS_ENV:
+ *
+ * If this environment variable is set to any value, connect to
+ * D-Bus session bus rather than the system bus.
+ *
+ * Used for testing.
+ **/
+#ifndef USE_SESSION_BUS_ENV
+#define USE_SESSION_BUS_ENV "UPSTART_USE_SESSION_BUS"
+#endif
+
 
 NIH_BEGIN_EXTERN
 
@@ -72,6 +84,8 @@
 				   const char *log_priority)
 	__attribute__ ((warn_unused_result));
 
+void control_handle_bus_type      (void);
+
 NIH_END_EXTERN
 
 #endif /* INIT_CONTROL_H */

=== modified file 'init/environ.c'
--- init/environ.c	2011-03-16 22:42:48 +0000
+++ init/environ.c	2011-06-03 10:15:15 +0000
@@ -2,7 +2,6 @@
  *
  * environ.c - environment table utilities
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/environ.h'
--- init/environ.h	2011-03-16 22:42:48 +0000
+++ init/environ.h	2011-06-03 10:15:15 +0000
@@ -1,6 +1,5 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/job_process.c'
--- init/job_process.c	2011-05-12 20:42:28 +0000
+++ init/job_process.c	2011-06-03 10:15:15 +0000
@@ -2,7 +2,6 @@
  *
  * job_process.c - job process handling
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/job_process.h'
--- init/job_process.h	2011-05-12 19:21:16 +0000
+++ init/job_process.h	2011-06-03 10:15:15 +0000
@@ -1,6 +1,5 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/main.c'
--- init/main.c	2011-03-16 22:54:56 +0000
+++ init/main.c	2011-06-03 10:15:15 +0000
@@ -1,7 +1,6 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -71,6 +70,8 @@
 static void usr1_handler    (void *data, NihSignal *signal);
 #endif /* DEBUG */
 
+static void handle_confdir  (void);
+
 
 /**
  * argv0:
@@ -90,13 +91,49 @@
 
 
 /**
+ * conf_dir:
+ *
+ * Full path to job configuration file directory.
+ *
+ **/
+static char *conf_dir = NULL;
+
+/**
+ * initial_event:
+ *
+ * Alternate event to emit at startup (rather than STARTUP_EVENT).
+ **/
+static char *initial_event = NULL;
+
+/**
+ * disable_startup_event:
+ *
+ * If TRUE, do not emit a startup event.
+ **/
+static int disable_startup_event = FALSE;
+
+extern int use_session_bus;
+
+/**
  * options:
  *
  * Command-line options we accept.
  **/
 static NihOption options[] = {
+	{ 0, "confdir", N_("specify alternative directory to load configuration files from"),
+		NULL, "DIR", &conf_dir, NULL },
+
+	{ 0, "no-startup-event", N_("do not emit any startup event (for testing)"),
+		NULL, NULL, &disable_startup_event, NULL },
+
 	{ 0, "restart", NULL, NULL, NULL, &restart, NULL },
 
+	{ 0, "session", N_("use D-Bus session bus rather than system bus (for testing)"),
+		NULL, NULL, &use_session_bus, NULL },
+
+	{ 0, "startup-event", N_("specify an alternative initial event (for testing)"),
+		NULL, "NAME", &initial_event, NULL },
+
 	/* Ignore invalid options */
 	{ '-', "--", NULL, NULL, NULL, NULL, NULL },
 
@@ -124,94 +161,105 @@
 	if (! args)
 		exit (1);
 
+	handle_confdir ();
+	control_handle_bus_type ();
+
 #ifndef DEBUG
-	/* Check we're root */
-	if (getuid ()) {
-		nih_fatal (_("Need to be root"));
-		exit (1);
-	}
-
-	/* Check we're process #1 */
-	if (getpid () > 1) {
-		execv (TELINIT, argv);
-		/* Ignore failure, probably just that telinit doesn't exist */
-
-		nih_fatal (_("Not being executed as init"));
-		exit (1);
-	}
-
-	/* Clear our arguments from the command-line, so that we show up in
-	 * ps or top output as /sbin/init, with no extra flags.
-	 *
-	 * This is a very Linux-specific trick; by deleting the NULL
-	 * terminator at the end of the last argument, we fool the kernel
-	 * into believing we used a setproctitle()-a-like to extend the
-	 * argument space into the environment space, and thus make it use
-	 * strlen() instead of its own assumed length.  In fact, we've done
-	 * the exact opposite, and shrunk the command line length to just that
-	 * of whatever is in argv[0].
-	 *
-	 * If we don't do this, and just write \0 over the rest of argv, for
-	 * example; the command-line length still includes those \0s, and ps
-	 * will show whitespace in their place.
-	 */
-	if (argc > 1) {
-		char *arg_end;
-
-		arg_end = argv[argc-1] + strlen (argv[argc-1]);
-		*arg_end = ' ';
-	}
-
-
-	/* Become the leader of a new session and process group, shedding
-	 * any controlling tty (which we shouldn't have had anyway - but
-	 * you never know what initramfs did).
-	 */
-	setsid ();
-
-	/* Set the standard file descriptors to the ordinary console device,
-	 * resetting it to sane defaults unless we're inheriting from another
-	 * init process which we know left it in a sane state.
-	 */
-	if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
-		nih_free (nih_error_get ());
-
-	/* Set the PATH environment variable */
-	setenv ("PATH", PATH, TRUE);
-
-	/* Switch to the root directory in case we were started from some
-	 * strange place, or worse, some directory in the initramfs that's
-	 * going to go away soon.
-	 */
-	if (chdir ("/"))
-		nih_warn ("%s: %s", _("Unable to set root directory"),
-			  strerror (errno));
-
-	/* Mount the /proc and /sys filesystems, which are pretty much
-	 * essential for any Linux system; not to mention used by
-	 * ourselves.
-	 */
-	if (system_mount ("proc", "/proc") < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_warn ("%s: %s", _("Unable to mount /proc filesystem"),
-			  err->message);
-		nih_free (err);
-	}
-
-	if (system_mount ("sysfs", "/sys") < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_warn ("%s: %s", _("Unable to mount /sys filesystem"),
-			  err->message);
-		nih_free (err);
-	}
+	if (use_session_bus == FALSE) {
+
+		/* Check we're root */
+		if (getuid ()) {
+			nih_fatal (_("Need to be root"));
+			exit (1);
+		}
+
+		/* Check we're process #1 */
+		if (getpid () > 1) {
+			execv (TELINIT, argv);
+			/* Ignore failure, probably just that telinit doesn't exist */
+
+			nih_fatal (_("Not being executed as init"));
+			exit (1);
+		}
+
+		/* Clear our arguments from the command-line, so that we show up in
+		 * ps or top output as /sbin/init, with no extra flags.
+		 *
+		 * This is a very Linux-specific trick; by deleting the NULL
+		 * terminator at the end of the last argument, we fool the kernel
+		 * into believing we used a setproctitle()-a-like to extend the
+		 * argument space into the environment space, and thus make it use
+		 * strlen() instead of its own assumed length.  In fact, we've done
+		 * the exact opposite, and shrunk the command line length to just that
+		 * of whatever is in argv[0].
+		 *
+		 * If we don't do this, and just write \0 over the rest of argv, for
+		 * example; the command-line length still includes those \0s, and ps
+		 * will show whitespace in their place.
+		 */
+		if (argc > 1) {
+			char *arg_end;
+
+			arg_end = argv[argc-1] + strlen (argv[argc-1]);
+			*arg_end = ' ';
+		}
+
+
+		/* Become the leader of a new session and process group, shedding
+		 * any controlling tty (which we shouldn't have had anyway - but
+		 * you never know what initramfs did).
+		 */
+		setsid ();
+
+		/* Set the standard file descriptors to the ordinary console device,
+		 * resetting it to sane defaults unless we're inheriting from another
+		 * init process which we know left it in a sane state.
+		 */
+		if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
+			nih_free (nih_error_get ());
+
+		/* Set the PATH environment variable */
+		setenv ("PATH", PATH, TRUE);
+
+		/* Switch to the root directory in case we were started from some
+		 * strange place, or worse, some directory in the initramfs that's
+		 * going to go away soon.
+		 */
+		if (chdir ("/"))
+			nih_warn ("%s: %s", _("Unable to set root directory"),
+				strerror (errno));
+
+		/* Mount the /proc and /sys filesystems, which are pretty much
+		 * essential for any Linux system; not to mention used by
+		 * ourselves.
+		 */
+		if (system_mount ("proc", "/proc") < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_warn ("%s: %s", _("Unable to mount /proc filesystem"),
+				err->message);
+			nih_free (err);
+		}
+
+		if (system_mount ("sysfs", "/sys") < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_warn ("%s: %s", _("Unable to mount /sys filesystem"),
+				err->message);
+			nih_free (err);
+		}
+	} else {
+		nih_log_set_priority (NIH_LOG_DEBUG);
+		nih_debug ("Running with UID %d as PID %d (PPID %d)",
+				(int)getuid (), (int)getpid (), (int)getppid ());
+	}
+
 #else /* DEBUG */
 	nih_log_set_priority (NIH_LOG_DEBUG);
-	nih_debug ("Running as PID %d (PPID %d)",
-		(int)getpid (), (int)getppid ());
+	nih_debug ("Running with UID %d as PID %d (PPID %d)",
+		(int)getuid (), (int)getpid (), (int)getppid ());
 #endif /* DEBUG */
 
 
@@ -223,11 +271,13 @@
 		nih_signal_reset ();
 
 #ifndef DEBUG
-	/* Catch fatal errors immediately rather than waiting for a new
-	 * iteration through the main loop.
-	 */
-	nih_signal_set_handler (SIGSEGV, crash_handler);
-	nih_signal_set_handler (SIGABRT, crash_handler);
+	if (use_session_bus == FALSE) {
+		/* Catch fatal errors immediately rather than waiting for a new
+		 * iteration through the main loop.
+		 */
+		nih_signal_set_handler (SIGSEGV, crash_handler);
+		nih_signal_set_handler (SIGABRT, crash_handler);
+	}
 #endif /* DEBUG */
 
 	/* Don't ignore SIGCHLD or SIGALRM, but don't respond to them
@@ -238,33 +288,35 @@
 	nih_signal_set_handler (SIGALRM, nih_signal_handler);
 
 #ifndef DEBUG
-	/* Ask the kernel to send us SIGINT when control-alt-delete is
-	 * pressed; generate an event with the same name.
-	 */
-	reboot (RB_DISABLE_CAD);
-	nih_signal_set_handler (SIGINT, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
-
-	/* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
-	 * generate a keyboard-request event.
-	 */
-	if (ioctl (0, KDSIGACCEPT, SIGWINCH) == 0) {
-		nih_signal_set_handler (SIGWINCH, nih_signal_handler);
-		NIH_MUST (nih_signal_add_handler (NULL, SIGWINCH,
-						  kbd_handler, NULL));
+	if (use_session_bus == FALSE) {
+		/* Ask the kernel to send us SIGINT when control-alt-delete is
+		 * pressed; generate an event with the same name.
+		 */
+		reboot (RB_DISABLE_CAD);
+		nih_signal_set_handler (SIGINT, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
+
+		/* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
+		 * generate a keyboard-request event.
+		 */
+		if (ioctl (0, KDSIGACCEPT, SIGWINCH) == 0) {
+			nih_signal_set_handler (SIGWINCH, nih_signal_handler);
+			NIH_MUST (nih_signal_add_handler (NULL, SIGWINCH,
+						kbd_handler, NULL));
+		}
+
+		/* powstatd sends us SIGPWR when it changes /etc/powerstatus */
+		nih_signal_set_handler (SIGPWR, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pwr_handler, NULL));
+
+		/* SIGHUP instructs us to re-load our configuration */
+		nih_signal_set_handler (SIGHUP, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGHUP, hup_handler, NULL));
+
+		/* SIGUSR1 instructs us to reconnect to D-Bus */
+		nih_signal_set_handler (SIGUSR1, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
 	}
-
-	/* powstatd sends us SIGPWR when it changes /etc/powerstatus */
-	nih_signal_set_handler (SIGPWR, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pwr_handler, NULL));
-
-	/* SIGHUP instructs us to re-load our configuration */
-	nih_signal_set_handler (SIGHUP, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGHUP, hup_handler, NULL));
-
-	/* SIGUSR1 instructs us to reconnect to D-Bus */
-	nih_signal_set_handler (SIGUSR1, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
 #endif /* DEBUG */
 
 
@@ -279,25 +331,27 @@
 
 	/* Read configuration */
 	NIH_MUST (conf_source_new (NULL, CONFFILE, CONF_FILE));
-	NIH_MUST (conf_source_new (NULL, CONFDIR, CONF_JOB_DIR));
+	NIH_MUST (conf_source_new (NULL, conf_dir, CONF_JOB_DIR));
 
 	conf_reload ();
 
 	/* Create a listening server for private connections. */
-	while (control_server_open () < 0) {
-		NihError *err;
+	if (use_session_bus == FALSE) {
+		while (control_server_open () < 0) {
+			NihError *err;
 
-		err = nih_error_get ();
-		if (err->number != ENOMEM) {
-			nih_warn ("%s: %s", _("Unable to listen for private connections"),
-				  err->message);
+			err = nih_error_get ();
+			if (err->number != ENOMEM) {
+				nih_warn ("%s: %s", _("Unable to listen for private connections"),
+					err->message);
+				nih_free (err);
+				break;
+			}
 			nih_free (err);
-			break;
 		}
-		nih_free (err);
 	}
 
-	/* Open connection to the system bus; we normally expect this to
+	/* Open connection to the appropriate D-Bus bus; we normally expect this to
 	 * fail and will try again later - don't let ENOMEM stop us though.
 	 */
 	while (control_bus_open () < 0) {
@@ -313,21 +367,32 @@
 	}
 
 #ifndef DEBUG
-	/* Now that the startup is complete, send all further logging output
-	 * to kmsg instead of to the console.
-	 */
-	if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
-		nih_free (nih_error_get ());
+	if (use_session_bus == FALSE) {
+		/* Now that the startup is complete, send all further logging output
+		 * to kmsg instead of to the console.
+		 */
+		if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
+			nih_free (nih_error_get ());
 
-	nih_log_set_logger (logger_kmsg);
+		nih_log_set_logger (logger_kmsg);
+	}
 #endif /* DEBUG */
 
 
 	/* Generate and run the startup event or read the state from the
 	 * init daemon that exec'd us
 	 */
-	if (! restart) {
-		NIH_MUST (event_new (NULL, STARTUP_EVENT, NULL));
+	if (! restart ) {
+		if (disable_startup_event) {
+			nih_debug ("Startup event disabled");
+		} else {
+			NIH_MUST (event_new (NULL,
+				initial_event
+				? initial_event
+				: STARTUP_EVENT,
+				NULL));
+		}
+
 	} else {
 		sigset_t mask;
 
@@ -573,3 +638,31 @@
 	}
 }
 #endif /* DEBUG */
+
+/**
+ * handle_confdir:
+ *
+ * Determine where system configuration files should be loaded from.
+ **/
+static void
+handle_confdir (void)
+{
+	char *dir;
+
+	/* user has already specified directory on command-line */
+	if (conf_dir)
+		goto out;
+
+	conf_dir = CONFDIR;
+
+	dir = getenv (CONFDIR_ENV);
+	if (! dir)
+		return;
+
+	conf_dir = dir;
+
+out:
+	nih_debug ("Using alternate configuration directory %s",
+			conf_dir);
+}
+

=== modified file 'init/man/init.5'
--- init/man/init.5	2011-05-12 20:42:28 +0000
+++ init/man/init.5	2011-06-03 10:15:15 +0000
@@ -9,9 +9,9 @@
 .SH DESCRIPTION
 On startup, the Upstart
 .BR init (8)
-daemon reads its job configuration from the
-.I /etc/init
-directory, and watches for future changes using
+daemon reads its job configuration from files in the
+.I /etc/init/
+directory, and watches for future changes to these files using
 .BR inotify (7).
 
 Files in this directory must end in
@@ -37,6 +37,9 @@
 within a stanza are permitted within single or double quotes, or if
 preceeded by a blackslash.
 
+If a stanza is duplicated, the last occurence will be used. Unrecognized
+stanzas will generate parse errors, which will stop a job from running.
+
 Stanzas and their arguments are delimited by whitespace, which consists
 of one or more space or tab characters which are otherwise ignored unless
 placed within single or double quotes.
@@ -69,7 +72,7 @@
 entire command being passed to a shell for expansion.
 
 .nf
-exec /usr/sbin/acpid -c $EVENTSDIR -s $SOCKET
+exec /usr/sbin/acpid \-c $EVENTSDIR \-s $SOCKET
 .fi
 .\"
 .TP
@@ -78,7 +81,7 @@
 be executed using
 .BR sh(1).
 The
-.I -e
+.I \-e
 shell option is always used, so any command that fails will terminate
 the script.
 
@@ -92,7 +95,7 @@
 .nf
 script
     dd bs=1 if=/proc/kmsg of=$KMSGSINK
-    exec /sbin/klogd -P $KMSGSINK
+    exec /sbin/klogd \-P $KMSGSINK
 end script
 .fi
 
@@ -105,14 +108,14 @@
 stanza.
 
 .TP
-.B pre-start exec\fR|\fBscript\fR...
+.B pre\-start exec\fR|\fBscript\fR...
 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.
 .\"
 .TP
-.B post-start exec\fR|\fBscript\fR...
+.B post\-start exec\fR|\fBscript\fR...
 This process will be run before the job's
 .BR started (7)
 event is emitted, but after the main process has been spawned.  It is
@@ -122,7 +125,7 @@
 event until the main process is ready to receive clients.
 .\"
 .TP
-.B pre-stop exec\fR|\fBscript\fR...
+.B pre\-stop exec\fR|\fBscript\fR...
 This process is run if the job is stopped by an event listed in its
 .B stop on
 stanza or by the
@@ -136,7 +139,7 @@
 command without arguments to cancel the stop.
 .\"
 .TP
-.B post-stop exec\fR|\fBscript\fR...
+.B post\-stop exec\fR|\fBscript\fR...
 This process is run after the main process has been killed and before
 the job's
 .BR stopped (7)
@@ -144,19 +147,19 @@
 such as removing temporary directories.
 
 .PP
-All of these processes, including the main process, are optional.  Services
-without a main process will appear to be running until they are stopped,
-this is commonly used to define states such as runlevels.  It's quite
-permissable to have no main process, but to have
-.B pre-start
+All of these processes, including the main process, are optional.
+Services without a main process will appear to be running until they are
+stopped: this is commonly used to define states such as runlevels.  It
+is permissable to have no main process, but to have
+.B pre\-start
 and
-.B post-stop
+.B post\-stop
 processes for the state.
 
 .RS
 .nf
-pre-start exec ifup -a
-post-stop exec ifdown -a
+pre\-start exec ifup \-a
+post\-stop exec ifdown \-a
 .fi
 .RE
 .\"
@@ -238,9 +241,9 @@
 .nf
 start on started gdm or started kdm
 
-start on device-added SUBSYSTEM=tty DEVPATH=ttyS*
+start on device\-added SUBSYSTEM=tty DEVPATH=ttyS*
 
-start on net-device-added INTERFACE!=lo
+start on net\-device\-added INTERFACE!=lo
 .fi
 .TP
 .B stop on \fIEVENT \fR[[\fIKEY=\fR]\fIVALUE\fR]... [\fBand\fR|\fBor\fR...]
@@ -249,7 +252,7 @@
 .B stop on
 stanza defines the set of events that will cause the job to be automatically
 stopped.  It has the same syntax as
-.B start on
+\fBstart on\fP.
 
 .I VALUE
 may additionally expand the value of any variable that came from the
@@ -258,7 +261,7 @@
 .nf
 stop on stopping gdm or stopping kdm
 
-stop on device-removed DEVPATH=$DEVPATH
+stop on device\-removed DEVPATH=$DEVPATH
 .fi
 
 .TP
@@ -284,11 +287,11 @@
 it will not be present if the job was started manually.
 
 In addition, the
-.B pre-stop
+.B pre\-stop
 and
-.B post-stop
+.B post\-stop
 scripts are run with the environment of the events or commands that
-stopped the job.  THe
+stopped the job.  The
 .B UPSTART_STOP_EVENTS
 environment variable contains the list of events that stopped the job,
 it will not be present if the job was stopped manually.
@@ -306,7 +309,8 @@
 .B env \fIKEY\fR[=\fIVALUE\fR]
 Defines a default environment variable, the value of which may be overriden
 by the event or command that starts the job.
-If no value is given, then the value is taken from the
+If \'KEY=VALUE\' is specified, the variable KEY is given the value VALUE.
+If only \'KEY\' is given, then the value is taken from the
 .BR init (8)
 daemon's own environment.
 .\"
@@ -366,7 +370,7 @@
 times in
 .I INTERVAL
 seconds, it will be considered to be having deeper problems and will
-be stopped.
+be stopped. Default COUNT is 10. Default INTERVAL is 5 seconds.
 
 This only applies to automatic respawns and not the
 .BR restart (8)
@@ -385,7 +389,8 @@
 .SS Instances
 By default, only one instance of any job is permitted to exist at one
 time.  Attempting to start a job when it's already starting or running
-results in an error.
+results in an error. Note that a job is considered to be running if its
+pre\-start process is running.
 
 Multiple instances may be permitted by defining the names of those
 instances.  If an instance with the same name is not already starting
@@ -405,12 +410,12 @@
 
 .nf
 instance $CONFFILE
-exec /sbin/httpd -c $CONFFILE
+exec /sbin/httpd \-c $CONFFILE
 .fi
 
 .nf
 instance $TTY
-exec /sbin/getty -8 38300 $TTY
+exec /sbin/getty \-8 38300 $TTY
 .fi
 
 These jobs appear in the
@@ -461,6 +466,11 @@
 
 This stanza allows a job to document in its job configuration what events
 it emits itself, and may be useful for graphing possible transitions.
+
+The
+.BR initctl "(8) " check\-config
+command attempts to use this stanza to resolve events.
+
 .\"
 .SS Process environment
 Many common adjustments to the process environment, such as resource
@@ -481,7 +491,7 @@
 is special, it not only connects the job to the system console but sets
 the job to be the owner of the system console, which means it will receive
 certain signals from the kernel when special key combinations such as
-Control-C are pressed.
+Control\-C are pressed.
 .\"
 .TP
 .B umask \fIUMASK
@@ -586,7 +596,7 @@
 .I SIGSTOP
 signal to indicate that it is ready.
 .BR init (8)
-will wait for this signal before running the job's post-start script,
+will wait for this signal before running the job's post\-start script,
 or considering the job to be running.
 
 .BR init (8)
@@ -600,7 +610,7 @@
 after being run.
 .BR init (8)
 will follow this daemonisation, and will wait for this to occur before
-running the job's post-start script or considering the job to be running.
+running the job's post\-start script or considering the job to be running.
 
 Without this stanza
 .BR init (8)
@@ -612,13 +622,56 @@
 Specifies that the job's main process will fork once after being run.
 .BR init (8)
 will follow this fork, and will wait for this to occur before
-running the job's post-start script or considering the job to be running.
+running the job's post\-start script or considering the job to be running.
 
 Without this stanza
 .BR init (8)
 is unable to supervise forking processes and will believe them to have
 stopped as soon as they fork on startup.
 .\"
+.SH BUGS
+The 
+.B and
+and 
+.B or
+operators allowed with
+.B start on
+and
+.B stop on
+do not work intuitively: operands to the right of either operator are
+only evaluated once and state information is then discarded. This can
+lead to jobs with complex \fBstart on\fP or \fPstop on\fP conditions
+not behaving as expected \fIwhen restarted\fP. For example, if a job
+encodes the following condition:
+.ti +4
+.sp 1
+.nf
+start on A and (B or C)
+.fi
+.P
+When \(aqA\(aq and \(aqB\(aq become true, the condition is satisfied so
+the job will be run. However, if the job ends and subsequently \(aqA\(aq
+and \(aqC\(aq become true, the job will \fInot\fP be re\-run even though
+the condtion is satisfied.  Avoid using complex conditions with jobs
+which need to be restarted.
+.\"
+.SH AUTHOR
+Manual page written by Scott James Remnant
+.RB < [e-mail] >
+and James Hunt
+.RB < [e-mail] > .
+.\"
+.SH REPORTING BUGS
+Report bugs at
+.RB < https://launchpad.net/upstart/+bugs >
+.\"
+.SH COPYRIGHT
+Copyright \(co 2009-2011 Canonical Ltd.
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+.\"
 .SH SEE ALSO
 .BR init (8)
 .BR sh (1)

=== modified file 'init/man/init.8'
--- init/man/init.8	2010-02-04 19:26:17 +0000
+++ init/man/init.8	2011-06-03 10:15:15 +0000
@@ -1,4 +1,4 @@
-.TH init 8 2010-02-04 "Upstart"
+.TH init 8 2011-05-31 "Upstart"
 .\"
 .SH NAME
 init \- Upstart process management daemon
@@ -64,7 +64,28 @@
 by placing them on the kernel command-line.
 .\"
 .TP
-.B --verbose
+.B \-\-confdir \fIdirectory\fP
+Read job configuration files from a directory other than
+\fI/etc/init\fP.
+.\"
+.TP
+.B \-\-no\-startup\-event
+Suppress emission of the initial startup event. This option should only
+be used for testing since it will stop the 
+.BR init (8)
+daemon from starting \fBany\fP jobs automatically.
+.\"
+.TP
+.B \-\-session
+Connect to the D\-Bus session bus. This should only be used for testing.
+.\"
+.TP
+.B \-\-startup-event \fIevent\fP
+Specify a different initial startup event from the standard
+.BR startup (7) .
+.\"
+.TP
+.B \-\-verbose
 Outputs verbose messages about job state changes and event emissions to the
 system console or log, useful for debugging boot.
 .\"
@@ -90,18 +111,19 @@
 .RB < https://launchpad.net/upstart/+bugs >
 .\"
 .SH COPYRIGHT
-Copyright \(co 2010 Canonical Ltd.
+Copyright \(co 2009\-2011 Canonical Ltd.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .SH SEE ALSO
+.BR control\-alt\-delete (7)
 .BR init (5)
 .BR initctl (8)
-.BR telinit (8)
 .BR runlevel (7)
 .BR startup (7)
 .BR starting (7)
 .BR started (7)
 .BR stopping (7)
 .BR stopped (7)
+.BR telinit (8)

=== modified file 'init/paths.h'
--- init/paths.h	2010-02-26 15:27:14 +0000
+++ init/paths.h	2011-06-03 10:15:15 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -67,7 +67,7 @@
 /**
  * CONFDIR:
  *
- * Top-level directory of the system configuration files.
+ * Default top-level directory of the system configuration files.
  **/
 #ifndef CONFDIR
 #define CONFDIR "/etc/init"
@@ -75,6 +75,20 @@
 
 
 /**
+ * CONFDIR_ENV:
+ *
+ * If this environment variable is set, read configuration files
+ * from the location specified, rather than CONFDIR.
+ *
+ * Value is expected to be the full path to an alternative job
+ * configuration directory.
+ **/
+#ifndef CONFDIR_ENV
+#define CONFDIR_ENV "UPSTART_CONFDIR"
+#endif
+
+
+/**
  * SHELL:
  *
  * This is the shell binary used whenever we need special processing for

=== modified file 'init/tests/test_conf.c'
--- init/tests/test_conf.c	2011-02-17 23:38:17 +0000
+++ init/tests/test_conf.c	2011-06-03 10:15:15 +0000
@@ -2,7 +2,6 @@
  *
  * test_conf.c - test suite for init/conf.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/tests/test_control.c'
--- init/tests/test_control.c	2011-03-16 22:42:48 +0000
+++ init/tests/test_control.c	2011-06-03 10:15:15 +0000
@@ -2,7 +2,6 @@
  *
  * test_dbus.c - test suite for init/dbus.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/tests/test_environ.c'
--- init/tests/test_environ.c	2011-03-16 22:42:48 +0000
+++ init/tests/test_environ.c	2011-06-03 10:15:15 +0000
@@ -2,7 +2,6 @@
  *
  * test_environ.c - test suite for init/environ.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/tests/test_job_class.c'
--- init/tests/test_job_class.c	2011-05-12 20:42:28 +0000
+++ init/tests/test_job_class.c	2011-06-03 10:15:15 +0000
@@ -2,7 +2,6 @@
  *
  * test_job_class.c - test suite for init/job_class.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c	2011-05-12 19:21:16 +0000
+++ init/tests/test_job_process.c	2011-06-03 10:15:15 +0000
@@ -2,7 +2,6 @@
  *
  * test_job_process.c - test suite for init/job_process.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'po/upstart.pot'
--- po/upstart.pot	2011-03-22 17:52:25 +0000
+++ po/upstart.pot	2011-06-03 10:15:15 +0000
@@ -6,76 +6,141 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: upstart 1.2\n"
+"Project-Id-Version: upstart 1.3\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-22 10:52-0700\n"
+"POT-Creation-Date: 2011-06-01 13:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: init/conf.c:238
+#: init/conf.c:237
 msgid "Unable to load configuration"
 msgstr ""
 
-#: init/conf.c:271
+#: init/conf.c:270
 #, c-format
 msgid "Loading configuration from %s"
 msgstr ""
 
-#: init/conf.c:308
+#: init/conf.c:307
 #, c-format
 msgid "Handling deletion of %s"
 msgstr ""
 
-#: init/conf.c:379
+#: init/conf.c:378
 msgid "Unable to watch configuration file"
 msgstr ""
 
-#: init/conf.c:457
+#: init/conf.c:456
 msgid "Unable to watch configuration directory"
 msgstr ""
 
-#: init/conf.c:569 init/conf.c:653
+#: init/conf.c:568 init/conf.c:652
 msgid "Error while loading configuration file"
 msgstr ""
 
-#: init/conf.c:609
+#: init/conf.c:608
 msgid "Configuration directory deleted"
 msgstr ""
 
-#: init/control.c:155
+#: init/control.c:162
 msgid "Connection from private client"
 msgstr ""
 
-#: init/control.c:290
+#: init/control.c:301
 msgid "Disconnected from system bus"
 msgstr ""
 
-#: init/control.c:356 init/main.c:546
+#: init/control.c:367 init/main.c:611
 msgid "Reloading configuration"
 msgstr ""
 
-#: init/control.c:396 init/control.c:507
+#: init/control.c:407 init/control.c:518
 msgid "Name may not be empty string"
 msgstr ""
 
-#: init/control.c:405
+#: init/control.c:416
 #, c-format
 msgid "Unknown job: %s"
 msgstr ""
 
-#: init/control.c:514 init/job_class.c:522 init/job_class.c:710
-#: init/job_class.c:829 init/job_class.c:953
+#: init/control.c:525 init/job_class.c:524 init/job_class.c:712
+#: init/job_class.c:831 init/job_class.c:955
 msgid "Env must be KEY=VALUE pairs"
 msgstr ""
 
-#: init/control.c:666
+#: init/control.c:677
 msgid "The log priority given was not recognised"
 msgstr ""
 
+#: init/errors.h:58
+msgid "Illegal parameter"
+msgstr ""
+
+#: init/errors.h:59
+msgid "Unknown parameter"
+msgstr ""
+
+#: init/errors.h:60 init/errors.h:71
+msgid "Expected operator"
+msgstr ""
+
+#: init/errors.h:61
+msgid "Mismatched braces"
+msgstr ""
+
+#: init/errors.h:62
+msgid "Illegal interval, expected number of seconds"
+msgstr ""
+
+#: init/errors.h:63
+msgid "Illegal exit status, expected integer"
+msgstr ""
+
+#: init/errors.h:64
+msgid "Illegal signal status, expected integer"
+msgstr ""
+
+#: init/errors.h:65
+msgid "Illegal file creation mask, expected octal integer"
+msgstr ""
+
+#: init/errors.h:66
+msgid "Illegal nice value, expected -20 to 19"
+msgstr ""
+
+#: init/errors.h:67
+msgid "Illegal oom adjustment, expected -16 to 15 or 'never'"
+msgstr ""
+
+#: init/errors.h:68
+msgid "Illegal oom score adjustment, expected -999 to 1000 or 'never'"
+msgstr ""
+
+#: init/errors.h:69
+msgid "Illegal limit, expected 'unlimited' or integer"
+msgstr ""
+
+#: init/errors.h:70
+msgid "Expected event"
+msgstr ""
+
+#: init/errors.h:72
+msgid "Expected variable name before value"
+msgstr ""
+
+#: init/errors.h:73
+msgid "Mismatched parentheses"
+msgstr ""
+
+#: init/errors.h:74
+msgid "Name already taken"
+msgstr ""
+
 #: init/event.c:273
 #, c-format
 msgid "Handling %s event"
@@ -164,241 +229,252 @@
 msgid "post-stop"
 msgstr ""
 
-#: init/job.c:1113 init/job_class.c:756
+#: init/job.c:1113 init/job_class.c:758
 #, c-format
 msgid "Job is already running: %s"
 msgstr ""
 
-#: init/job.c:1177 init/job.c:1242 init/job_class.c:875 init/job_class.c:998
+#: init/job.c:1177 init/job.c:1242 init/job_class.c:877 init/job_class.c:1000
 #, c-format
 msgid "Job has already been stopped: %s"
 msgstr ""
 
-#: init/job_class.c:559 init/job_class.c:604 init/job_class.c:867
-#: init/job_class.c:990
+#: init/job_class.c:561 init/job_class.c:606 init/job_class.c:869
+#: init/job_class.c:992
 #, c-format
 msgid "Unknown instance: %s"
 msgstr ""
 
-#: init/job_process.c:279
+#: init/job_process.c:276
 #, c-format
 msgid "Failed to spawn %s %s process: %s"
 msgstr ""
 
-#: init/job_process.c:285
+#: init/job_process.c:282
 msgid "Temporary process spawn error"
 msgstr ""
 
-#: init/job_process.c:292
+#: init/job_process.c:289
 #, c-format
 msgid "%s %s process (%d)"
 msgstr ""
 
-#: init/job_process.c:399
+#: init/job_process.c:402
 #, c-format
 msgid "Pausing %s (%d) [pre-exec] for debug"
 msgstr ""
 
-#: init/job_process.c:453
+#: init/job_process.c:472
 #, c-format
 msgid "Failed to open system console: %s"
 msgstr ""
 
-#: init/job_process.c:669
+#: init/job_process.c:696
+#, c-format
+msgid "unable to move script fd: %s"
+msgstr ""
+
+#: init/job_process.c:701
 #, c-format
 msgid "unable to open console: %s"
 msgstr ""
 
-#: init/job_process.c:724
+#: init/job_process.c:756
 #, c-format
 msgid "unable to set \"%s\" resource limit: %s"
 msgstr ""
 
-#: init/job_process.c:729
+#: init/job_process.c:761
 #, c-format
 msgid "unable to set priority: %s"
 msgstr ""
 
-#: init/job_process.c:734
+#: init/job_process.c:766
 #, c-format
 msgid "unable to set oom adjustment: %s"
 msgstr ""
 
-#: init/job_process.c:739
+#: init/job_process.c:771
 #, c-format
 msgid "unable to change root directory: %s"
 msgstr ""
 
-#: init/job_process.c:744
+#: init/job_process.c:776
 #, c-format
 msgid "unable to change working directory: %s"
 msgstr ""
 
-#: init/job_process.c:749
+#: init/job_process.c:781
 #, c-format
 msgid "unable to set trace: %s"
 msgstr ""
 
-#: init/job_process.c:754
+#: init/job_process.c:786
 #, c-format
 msgid "unable to execute: %s"
 msgstr ""
 
-#: init/job_process.c:785
-#, c-format
-msgid "Sending TERM signal to %s %s process (%d)"
-msgstr ""
-
-#: init/job_process.c:793
-#, c-format
-msgid "Failed to send TERM signal to %s %s process (%d): %s"
-msgstr ""
-
-#: init/job_process.c:833
-#, c-format
-msgid "Sending KILL signal to %s %s process (%d)"
-msgstr ""
-
-#: init/job_process.c:841
-#, c-format
-msgid "Failed to send KILL signal to %s %s process (%d): %s"
-msgstr ""
-
-#: init/job_process.c:901
+#: init/job_process.c:817 init/job_process.c:867
+#, c-format
+msgid "Sending %s signal to %s %s process (%d)"
+msgstr ""
+
+#: init/job_process.c:826 init/job_process.c:876
+#, c-format
+msgid "Failed to send %s signal to %s %s process (%d): %s"
+msgstr ""
+
+#: init/job_process.c:937
 #, c-format
 msgid "%s %s process (%d) terminated with status %d"
 msgstr ""
 
-#: init/job_process.c:906
+#: init/job_process.c:942
 #, c-format
 msgid "%s %s process (%d) exited normally"
 msgstr ""
 
-#: init/job_process.c:921
+#: init/job_process.c:957
 #, c-format
 msgid "%s %s process (%d) killed by %s signal"
 msgstr ""
 
-#: init/job_process.c:925
+#: init/job_process.c:961
 #, c-format
 msgid "%s %s process (%d) killed by signal %d"
 msgstr ""
 
-#: init/job_process.c:939
+#: init/job_process.c:975
 #, c-format
 msgid "%s %s process (%d) stopped by %s signal"
 msgstr ""
 
-#: init/job_process.c:943
+#: init/job_process.c:979
 #, c-format
 msgid "%s %s process (%d) stopped by signal %d"
 msgstr ""
 
-#: init/job_process.c:957
+#: init/job_process.c:993
 #, c-format
 msgid "%s %s process (%d) continued by %s signal"
 msgstr ""
 
-#: init/job_process.c:961
+#: init/job_process.c:997
 #, c-format
 msgid "%s %s process (%d) continued by signal %d"
 msgstr ""
 
-#: init/job_process.c:1096
+#: init/job_process.c:1132
 #, c-format
 msgid "%s respawning too fast, stopped"
 msgstr ""
 
-#: init/job_process.c:1102
+#: init/job_process.c:1138
 #, c-format
 msgid "%s %s process ended, respawning"
 msgstr ""
 
-#: init/job_process.c:1342
+#: init/job_process.c:1378
 #, c-format
 msgid "Failed to set ptrace options for %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1355 init/job_process.c:1550
+#: init/job_process.c:1391 init/job_process.c:1586
 #, c-format
 msgid "Failed to continue traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1395 init/job_process.c:1486 init/job_process.c:1541
+#: init/job_process.c:1431 init/job_process.c:1522 init/job_process.c:1577
 #, c-format
 msgid "Failed to detach traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1435
+#: init/job_process.c:1471
 #, c-format
 msgid "Failed to deliver signal to traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1470
+#: init/job_process.c:1506
 #, c-format
 msgid "Failed to obtain child process id for %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1477
+#: init/job_process.c:1513
 #, c-format
 msgid "%s %s process (%d) became new process (%d)"
 msgstr ""
 
-#: init/job_process.c:1536
+#: init/job_process.c:1572
 #, c-format
 msgid "%s %s process (%d) executable changed"
 msgstr ""
 
-#: init/main.c:117
+#: init/main.c:123
+msgid "specify alternative directory to load configuration files from"
+msgstr ""
+
+#: init/main.c:126
+msgid "do not emit any startup event (for testing)"
+msgstr ""
+
+#: init/main.c:131
+msgid "use D-Bus session bus rather than system bus (for testing)"
+msgstr ""
+
+#: init/main.c:134
+msgid "specify an alternative initial event (for testing)"
+msgstr ""
+
+#: init/main.c:154
 msgid "Process management daemon."
 msgstr ""
 
-#: init/main.c:119
+#: init/main.c:156
 msgid ""
 "This daemon is normally executed by the kernel and given process id 1 to "
 "denote its special status.  When executed by a user process, it will "
 "actually run /sbin/telinit."
 msgstr ""
 
-#: init/main.c:130 util/reboot.c:167 util/shutdown.c:363 util/telinit.c:148
+#: init/main.c:172 util/reboot.c:166 util/shutdown.c:363 util/telinit.c:148
 msgid "Need to be root"
 msgstr ""
 
-#: init/main.c:139
+#: init/main.c:181
 msgid "Not being executed as init"
 msgstr ""
 
-#: init/main.c:187 init/main.c:456
+#: init/main.c:229 init/main.c:521
 msgid "Unable to set root directory"
 msgstr ""
 
-#: init/main.c:198
+#: init/main.c:240
 msgid "Unable to mount /proc filesystem"
 msgstr ""
 
-#: init/main.c:207
+#: init/main.c:249
 msgid "Unable to mount /sys filesystem"
 msgstr ""
 
-#: init/main.c:292
+#: init/main.c:345
 msgid "Unable to listen for private connections"
 msgstr ""
 
-#: init/main.c:473
+#: init/main.c:538
 #, c-format
 msgid "Caught %s, core dumped"
 msgstr ""
 
-#: init/main.c:477
+#: init/main.c:542
 #, c-format
 msgid "Caught %s, unable to dump core"
 msgstr ""
 
-#: init/main.c:563
+#: init/main.c:628
 msgid "Reconnecting to system bus"
 msgstr ""
 
-#: init/main.c:569
+#: init/main.c:634
 msgid "Unable to connect to the system bus"
 msgstr ""
 
@@ -406,76 +482,110 @@
 msgid "main"
 msgstr ""
 
-#: util/initctl.c:145
+#: util/initctl.c:305
 msgid "Unable to connect to system bus"
 msgstr ""
 
-#: util/initctl.c:154
+#: util/initctl.c:306
+msgid "Unable to connect to session bus"
+msgstr ""
+
+#: util/initctl.c:315
 #, c-format
 msgid "%s: --dest given without --system\n"
 msgstr ""
 
-#: util/initctl.c:162
+#: util/initctl.c:323
 msgid "Unable to connect to Upstart"
 msgstr ""
 
-#: util/initctl.c:348 util/initctl.c:483 util/initctl.c:611 util/initctl.c:745
-#: util/initctl.c:850
+#: util/initctl.c:509 util/initctl.c:644 util/initctl.c:772 util/initctl.c:907
+#: util/initctl.c:1012
 #, c-format
 msgid "%s: missing job name\n"
 msgstr ""
 
-#: util/initctl.c:796
+#: util/initctl.c:958
 msgid "Not running"
 msgstr ""
 
-#: util/initctl.c:1065
+#: util/initctl.c:1314
 #, c-format
 msgid "%s: missing event name\n"
 msgstr ""
 
-#: util/initctl.c:1261
+#: util/initctl.c:1511
+msgid "Invalid job class"
+msgstr ""
+
+#: util/initctl.c:2108
+msgid "unknown event"
+msgstr ""
+
+#: util/initctl.c:2112
+msgid "unknown job"
+msgstr ""
+
+#: util/initctl.c:2213
+msgid "use D-Bus session bus to connect to init daemon (for testing)"
+msgstr ""
+
+#: util/initctl.c:2215
 msgid "use D-Bus system bus to connect to init daemon"
 msgstr ""
 
-#: util/initctl.c:1263
-msgid "destination well-known name on system bus"
+#: util/initctl.c:2217
+msgid "destination well-known name on D-Bus bus"
 msgstr ""
 
-#: util/initctl.c:1276
+#: util/initctl.c:2230
 msgid "do not wait for job to start before exiting"
 msgstr ""
 
-#: util/initctl.c:1288
+#: util/initctl.c:2242
 msgid "do not wait for job to stop before exiting"
 msgstr ""
 
-#: util/initctl.c:1300
+#: util/initctl.c:2254
 msgid "do not wait for job to restart before exiting"
 msgstr ""
 
-#: util/initctl.c:1339
+#: util/initctl.c:2293
 msgid "do not wait for event to finish before exiting"
 msgstr ""
 
-#: util/initctl.c:1378
+#: util/initctl.c:2334
+msgid ""
+"enumerate list of events and jobs causing job created from job config to "
+"start/stop"
+msgstr ""
+
+#: util/initctl.c:2347
+msgid "ignore specified list of events (comma-separated)"
+msgstr ""
+
+#: util/initctl.c:2349
+msgid "Generate warning for any unreachable events/jobs"
+msgstr ""
+
+#: util/initctl.c:2358
 msgid "Job"
 msgstr ""
 
-#: util/initctl.c:1385
+#: util/initctl.c:2365
 msgid "Event"
 msgstr ""
 
-#: util/initctl.c:1393 util/initctl.c:1405 util/initctl.c:1416
-#: util/initctl.c:1427 util/initctl.c:1434
+#: util/initctl.c:2373 util/initctl.c:2385 util/initctl.c:2396
+#: util/initctl.c:2407 util/initctl.c:2414
 msgid "JOB [KEY=VALUE]..."
 msgstr ""
 
-#: util/initctl.c:1394
+#: util/initctl.c:2374
 msgid "Start job."
 msgstr ""
 
-#: util/initctl.c:1395
+#: util/initctl.c:2375
 msgid ""
 "JOB is the name of the job that is to be started, this may be followed by "
 "zero or more environment variables to be defined in the new job.\n"
@@ -485,11 +595,11 @@
 "an existing instance is already running."
 msgstr ""
 
-#: util/initctl.c:1406
+#: util/initctl.c:2386
 msgid "Stop job."
 msgstr ""
 
-#: util/initctl.c:1407
+#: util/initctl.c:2387
 msgid ""
 "JOB is the name of the job that is to be stopped, this may be followed by "
 "zero or more environment variables to be passed to the job's pre-stop and "
@@ -499,11 +609,11 @@
 "decide which of multiple instances will be stopped."
 msgstr ""
 
-#: util/initctl.c:1417
+#: util/initctl.c:2397
 msgid "Restart job."
 msgstr ""
 
-#: util/initctl.c:1418
+#: util/initctl.c:2398
 msgid ""
 "JOB is the name of the job that is to be restarted, this may be followed by "
 "zero or more environment variables to be defined in the job after "
@@ -513,66 +623,66 @@
 "decide which of multiple instances will be restarted."
 msgstr ""
 
-#: util/initctl.c:1428
+#: util/initctl.c:2408
 msgid "Send HUP signal to job."
 msgstr ""
 
-#: util/initctl.c:1429
+#: util/initctl.c:2409
 msgid ""
 "JOB is the name of the job that is to be sent the signal, this may be "
 "followed by zero or more environment variables to distinguish between job "
 "instances.\n"
 msgstr ""
 
-#: util/initctl.c:1435
+#: util/initctl.c:2415
 msgid "Query status of job."
 msgstr ""
 
-#: util/initctl.c:1436
+#: util/initctl.c:2416
 msgid ""
 "JOB is the name of the job that is to be queried, this may be followed by "
 "zero or more environment variables to distguish between job instances.\n"
 msgstr ""
 
-#: util/initctl.c:1442
+#: util/initctl.c:2422
 msgid "List known jobs."
 msgstr ""
 
-#: util/initctl.c:1443
+#: util/initctl.c:2423
 msgid "The known jobs and their current status will be output."
 msgstr ""
 
-#: util/initctl.c:1446
+#: util/initctl.c:2426
 msgid "EVENT [KEY=VALUE]..."
 msgstr ""
 
-#: util/initctl.c:1447
+#: util/initctl.c:2427
 msgid "Emit an event."
 msgstr ""
 
-#: util/initctl.c:1448
+#: util/initctl.c:2428
 msgid ""
 "EVENT is the name of an event the init daemon should emit, this may be "
 "followed by zero or more environment variables to be included in the event.\n"
 msgstr ""
 
-#: util/initctl.c:1454
+#: util/initctl.c:2434
 msgid "Reload the configuration of the init daemon."
 msgstr ""
 
-#: util/initctl.c:1458
+#: util/initctl.c:2438
 msgid "Request the version of the init daemon."
 msgstr ""
 
-#: util/initctl.c:1461
+#: util/initctl.c:2441
 msgid "[PRIORITY]"
 msgstr ""
 
-#: util/initctl.c:1462
+#: util/initctl.c:2442
 msgid "Change the minimum priority of log messages from the init daemon"
 msgstr ""
 
-#: util/initctl.c:1464
+#: util/initctl.c:2444
 msgid ""
 "PRIORITY may be one of:\n"
 "  `debug' (messages useful for debugging upstart are logged, equivalent to --"
@@ -589,59 +699,83 @@
 "Without arguments, this outputs the current log priority."
 msgstr ""
 
-#: util/reboot.c:114
+#: util/initctl.c:2461 util/initctl.c:2467
+msgid "[CONF]"
+msgstr ""
+
+#: util/initctl.c:2462
+msgid "Show emits, start on and stop on details for job configurations."
+msgstr ""
+
+#: util/initctl.c:2463
+msgid ""
+"If CONF specified, show configuration details for single job configuration, "
+"else show details for all jobs configurations.\n"
+msgstr ""
+
+#: util/initctl.c:2468
+msgid "Check for unreachable jobs/event conditions."
+msgstr ""
+
+#: util/initctl.c:2469
+msgid ""
+"List all jobs and events which cannot be satisfied by currently available "
+"job configuration files"
+msgstr ""
+
+#: util/reboot.c:113
 msgid "don't sync before reboot or halt"
 msgstr ""
 
-#: util/reboot.c:116
+#: util/reboot.c:115
 msgid "force reboot or halt, don't call shutdown(8)"
 msgstr ""
 
-#: util/reboot.c:118
+#: util/reboot.c:117
 msgid "switch off the power when called as halt"
 msgstr ""
 
-#: util/reboot.c:120
+#: util/reboot.c:119
 msgid "don't actually reboot or halt, just write wtmp record"
 msgstr ""
 
-#: util/reboot.c:145
+#: util/reboot.c:144
 msgid "Halt the system."
 msgstr ""
 
-#: util/reboot.c:148
+#: util/reboot.c:147
 msgid "Power off the system."
 msgstr ""
 
-#: util/reboot.c:151
+#: util/reboot.c:150
 msgid "Reboot the system."
 msgstr ""
 
-#: util/reboot.c:155
+#: util/reboot.c:154
 msgid ""
 "This command is intended to instruct the kernel to reboot or halt the "
 "system; when run without the -f option, or when in a system runlevel other "
 "than 0 or 6, it will actually execute /sbin/shutdown.\n"
 msgstr ""
 
-#: util/reboot.c:211
+#: util/reboot.c:210
 msgid "Calling shutdown"
 msgstr ""
 
-#: util/reboot.c:214
+#: util/reboot.c:213
 #, c-format
 msgid "Unable to execute shutdown: %s"
 msgstr ""
 
-#: util/reboot.c:235
+#: util/reboot.c:234
 msgid "Rebooting"
 msgstr ""
 
-#: util/reboot.c:239
+#: util/reboot.c:238
 msgid "Halting"
 msgstr ""
 
-#: util/reboot.c:243
+#: util/reboot.c:242
 msgid "Powering off"
 msgstr ""
 

=== added directory 'scripts'
=== added file 'scripts/Makefile.am'
--- scripts/Makefile.am	1970-01-01 00:00:00 +0000
+++ scripts/Makefile.am	2011-06-03 10:15:15 +0000
@@ -0,0 +1,25 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = \
+  initctl2dot.py \
+  init-checkconf.sh
+
+dist_man_MANS = \
+  man/initctl2dot.8 \
+  man/init-checkconf.8
+
+install-exec-hook: $(EXTRA_DIST)
+	[ ! -d "$(DESTDIR)/$(bindir)" ] && mkdir -p "$(DESTDIR)/$(bindir)"; \
+	for file in $(EXTRA_DIST); do \
+		from=`echo "$$file" | sed '$(transform)'`; \
+		to=`basename $$from | cut -d. -f1`; \
+		echo "  cp '$(srcdir)/$$from' '$(DESTDIR)$(bindir)/$$to'"; \
+		cp "$(srcdir)/$$from" "$(DESTDIR)$(bindir)/$$to"; \
+	done
+
+uninstall-hook:
+	for file in $(EXTRA_DIST); do \
+		inst=`basename $$file | cut -d. -f1`; \
+		echo "  rm -f '$(DESTDIR)$(bindir)/$$inst'"; \
+		rm -f "$(DESTDIR)$(bindir)/$$inst"; \
+	done

=== added file 'scripts/init-checkconf.sh'
--- scripts/init-checkconf.sh	1970-01-01 00:00:00 +0000
+++ scripts/init-checkconf.sh	2011-06-03 10:15:15 +0000
@@ -0,0 +1,248 @@
+#!/bin/bash
+#---------------------------------------------------------------------
+# Script to determine if specified config file is valid or not.
+# By default, two checks are performed:
+#
+#   - Ensure Upstart can parse overall file successfully
+#   - Ensure all script sections are parseable by shell
+#
+#---------------------------------------------------------------------
+#
+# Copyright (C) 2011 Canonical Ltd.
+#
+# Author: James Hunt <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#---------------------------------------------------------------------
+
+script_name=${0##*/}
+confdir=$(mktemp -d /tmp/${script_name}.XXXXXXXXXX)
+upstart_path=/sbin/init
+initctl_path=/sbin/initctl
+debug_enabled=n
+file_valid=n
+running=n
+check_scripts=y
+
+cleanup()
+{
+  if [ ! -z "$upstart_pid" ]
+  then
+    debug "stopping secondary Upstart (running with PID $upstart_pid)"
+    kill -0 "$upstart_pid" >/dev/null 2>&1 && \
+    kill -9 "$upstart_pid" >/dev/null 2>&1
+  fi
+
+  [ -d "$confdir" ] && rm -rf "$confdir"
+  [ $file_valid = y ] && exit 0
+  exit 1
+}
+
+usage()
+{
+cat <<EOT
+Description: Determine if specified Upstart (init(8)) job configuration
+             file is valid.
+
+Usage: $script_name [options] -f <conf_file>
+       $script_name [options]    <conf_file>
+
+Options:
+
+ -d, --debug           : Show some debug output.
+ -f <file>,            : Job configuration file to check.
+ --file=<file>           (no default).
+ -i <path>,            : Specify path to initctl binary
+ --initctl-path=<path>   (default=$initctl_path).
+ -s, --noscript        : Do not check script sections.
+ -x <path>             : Specify path to init daemon binary
+ --upstart-path=<path>   (default=$upstart_path).
+ -h, --help            : Show this help.
+
+EOT
+}
+
+debug()
+{
+  msg="$*"
+  [ $debug_enabled = y ] && echo "DEBUG: $msg"
+}
+
+error()
+{
+  msg="$*"
+  printf "ERROR: %s\n" "$msg" >&2
+}
+
+die()
+{
+  error "$*"
+  exit 1
+}
+
+# Return 0 if Upstart is running on the D-Bus session bus, else 1.
+upstart_running()
+{
+  dbus-send --session --print-reply \
+    --dest='com.ubuntu.Upstart' /com/ubuntu/Upstart \
+    org.freedesktop.DBus.Properties.GetAll \
+    string:'com.ubuntu.Upstart0_6' >/dev/null 2>&1
+}
+
+trap cleanup EXIT INT TERM
+
+args=$(getopt \
+  -n "$script_name" \
+  -a \
+  --options="df:hi:sx:" \
+  --longoptions="debug file: help initctl-path: noscript upstart-path:" \
+  -- "$@")
+
+eval set -- "$args"
+[ $? -ne 0 ] && { usage; exit 1; }
+[ $# -eq 0 ] && { usage; exit 0; }
+
+while [ $# -gt 0 ]
+do
+    case "$1" in
+      -d|--debug)
+        debug_enabled=y
+        ;;
+
+      -f|--file)
+        file="$2"
+        shift
+        ;;
+
+      -h|--help)
+        usage
+        exit 0
+        ;;
+
+      -i|--initctl-path)
+        initctl_path="$2"
+        shift
+        ;;
+
+      -s|--noscript)
+        check_scripts=n
+        ;;
+
+      -x|--upstart-path)
+        upstart_path="$2"
+        shift
+        ;;
+
+      --)
+        shift
+        break
+        ;;
+    esac
+    shift
+done
+
+[ -z "$file" ] && file="$1"
+
+# safety first
+[ "$(id -u)" -eq 0 ] && die "cannot run as root"
+
+[   -z "$file" ] && die "must specify configuration file"
+[ ! -f "$file" ] && die "file $file does not exist"
+
+debug "upstart_path=$upstart_path"
+debug "initctl_path=$initctl_path"
+
+for cmd in "$upstart_path" "$initctl_path"
+do
+  [ -f "$cmd" ] || die "Path $cmd does not exist"
+  [ -x "$cmd" ] || die "File $cmd not executable"
+  "$cmd" --help | grep -q -- --session || die "version of $cmd too old"
+done
+
+# this is the only safe way to run another instance of Upstart
+"$upstart_path" --help|grep -q -- --no-startup-event || die "$upstart_path too old"
+
+debug "confdir=$confdir"
+debug "file=$file"
+
+filename=$(basename $file)
+
+echo "$filename" | egrep -q '\.conf$' || die "file must end in .conf"
+
+job="${filename%.conf}"
+
+cp "$file" "$confdir"
+debug "job=$job"
+
+upstart_running
+[ $? -eq 0 ] && die "Another instance of this program is already running"
+debug "ok - no other running instances detected"
+
+upstart_out="$(mktemp --tmpdir "${script_name}-upstart-output.XXXXXXXXXX")"
+debug "upstart_out=$upstart_out"
+
+upstart_cmd=$(printf \
+   "%s --session --no-sessions --no-startup-event --verbose --confdir %s" \
+  "$upstart_path" \
+  "$confdir")
+debug "upstart_cmd=$upstart_cmd"
+
+nohup $upstart_cmd >"$upstart_out" 2>&1 &
+upstart_pid=$!
+
+# Stop the shell outputting a message when Upstart is killed.
+# We handle this ourselves in cleanup().
+disown 
+
+# wait for Upstart to initialize
+for i in $(seq 1 5)
+do
+  debug "Waiting for Upstart to reply over D-Bus (attempt $i)"
+  upstart_running
+  if [ $? -eq 0 ]
+  then
+    running=y
+    break
+  fi
+  sleep 1
+done
+
+[ $running = n ] && die "failed to ask Upstart to check conf file"
+
+debug "Secondary Upstart ($upstart_cmd) running with PID $upstart_pid"
+
+if [ "$check_scripts" = y ]
+then
+  for section in pre-start post-start script pre-stop post-stop
+  do
+    if egrep -q "\<${section}\>" "$file"
+    then
+      cmd='sed -n "/^ *${section}/,/^ *end script/p" $file | /bin/sh -n 2>&1'
+      errors=$(eval "$cmd")
+      [ $? -ne 0 ] && \
+        die "$(printf "File $file: shell syntax invalid in $section section:\n${errors}")"
+    fi
+  done
+fi
+
+"$initctl_path" --session list|grep -q "^${job}"
+if [ $? -eq 0 ]
+then
+  file_valid=y
+  echo "File $file: syntax ok"
+  exit 0
+fi
+
+errors=$(grep "$job" "$upstart_out"|sed "s,${confdir}/,,g")
+die "$(printf "File $file: syntax invalid:\n${errors}")"

=== added file 'scripts/initctl2dot.py'
--- scripts/initctl2dot.py	1970-01-01 00:00:00 +0000
+++ scripts/initctl2dot.py	2011-06-03 10:15:15 +0000
@@ -0,0 +1,571 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#---------------------------------------------------------------------
+#
+# Copyright © 2011 Canonical Ltd.
+#
+# Author: James Hunt <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# Script to take output of "initctl show-config -e" and convert it into
+# a Graphviz DOT language (".dot") file for procesing with dot(1), etc.
+#
+# Notes:
+#
+# - Slightly laborious logic used to satisfy graphviz requirement that
+#   all nodes be defined before being referenced.
+#
+# Usage:
+#
+#   initctl show-config -e > initctl.out
+#   initctl2dot -f initctl.out -o upstart.dot
+#   dot -Tpng -o upstart.png upstart.dot
+#
+# Or more simply:
+#
+#  initctl2dot -o - | dot -Tpng -o upstart.png
+#
+# See also:
+#
+# - dot(1).
+# - initctl(8).
+# - http://www.graphviz.org.
+#---------------------------------------------------------------------
+
+import sys
+import re
+import fnmatch
+import os
+from string import split
+import datetime
+from subprocess import (Popen, PIPE)
+from optparse import OptionParser
+
+jobs   = {}
+events = {}
+cmd = "initctl --system show-config -e"
+script_name =  os.path.basename(sys.argv[0])
+
+job_events = [ 'starting', 'started', 'stopping', 'stopped' ]
+
+# list of jobs to restict output to
+restrictions_list = []
+
+default_color_emits    = 'green'
+default_color_start_on = 'blue'
+default_color_stop_on  = 'red'
+default_color_event    = 'thistle'
+default_color_job      = '#DCDCDC' # "Gainsboro"
+default_color_text     = 'black'
+default_color_bg       = 'white'
+
+default_outfile        = 'upstart.dot'
+
+
+def header(ofh):
+  global options
+
+  str  = "digraph upstart {\n"
+
+  # make the default node an event to simplify glob code
+  str += "  node [shape=\"diamond\", fontcolor=\"%s\", fillcolor=\"%s\", style=\"filled\"];\n" \
+    % (options.color_event_text, options.color_event)
+  str += "  rankdir=LR;\n"
+  str += "  overlap=false;\n"
+  str += "  bgcolor=\"%s\";\n" % options.color_bg
+  str += "  fontcolor=\"%s\";\n" % options.color_text
+
+  ofh.write(str)
+
+
+def footer(ofh):
+  global options
+
+  epilog = "overlap=false;\n"
+  epilog += "label=\"Generated on %s by %s\\n" % \
+    (str(datetime.datetime.now()), script_name)
+
+  if options.restrictions:
+    epilog += "(subset, "
+  else:
+    epilog += "("
+
+  if options.infile:
+    epilog += "from file data).\\n"
+  else:
+    epilog += "from '%s' on host %s).\\n" % \
+      (cmd, os.uname()[1])
+
+  epilog += "Boxes of color %s denote jobs.\\n" % options.color_job
+  epilog += "Solid diamonds of color %s denote events.\\n" % options.color_event
+  epilog += "Dotted diamonds denote 'glob' events.\\n"
+  epilog += "Emits denoted by %s lines.\\n" % options.color_emits
+  epilog += "Start on denoted by %s lines.\\n" % options.color_start_on
+  epilog += "Stop on denoted by %s lines.\\n" % options.color_stop_on
+  epilog += "\";\n"
+  epilog += "}\n"
+  ofh.write(epilog)
+
+
+# Map dash to underscore since graphviz node names cannot
+# contain dashes. Also remove dollars and colons
+def sanitise(s):
+  return s.replace('-', '_').replace('$', 'dollar_').replace('[', \
+  'lbracket').replace(']', 'rbracket').replace('!', \
+  'bang').replace(':', '_').replace('*', 'star').replace('?', 'question')
+
+
+# Convert a dollar in @name to a unique-ish new name, based on @job and
+# return it. Used for very rudimentary instance handling.
+def encode_dollar(job, name):
+  if name[0] == '$':
+    name = job + ':' + name
+  return name
+
+
+def mk_node_name(name):
+  return sanitise(name)
+
+
+# Jobs and events can have identical names, so prefix them to namespace
+# them off.
+def mk_job_node_name(name):
+  return mk_node_name('job_' + name)
+
+
+def mk_event_node_name(name):
+  return mk_node_name('event_' + name)
+
+
+def show_event(ofh, name):
+    global options
+    str = "%s [label=\"%s\", shape=diamond, fontcolor=\"%s\", fillcolor=\"%s\"," % \
+      (mk_event_node_name(name), name, options.color_event_text, options.color_event)
+
+    if '*' in name:
+      str += " style=\"dotted\""
+    else:
+      str += " style=\"filled\""
+
+    str += "];\n"
+
+    ofh.write(str)
+
+def show_events(ofh):
+  global events
+  global options
+  global restrictions_list
+
+  events_to_show = []
+
+  if restrictions_list:
+    for job in restrictions_list:
+
+      # We want all events emitted by the jobs in the restrictions_list.
+      events_to_show += jobs[job]['emits']
+
+      # We also want all events that jobs in restrictions_list start/stop
+      # on.
+      events_to_show += jobs[job]['start on']['event']
+      events_to_show += jobs[job]['stop on']['event']
+
+      # We also want all events emitted by all jobs that jobs in the
+      # restrictions_list start/stop on. Finally, we want all events
+      # emmitted by those jobs in the restrictions_list that we
+      # start/stop on.
+      for j in jobs[job]['start on']['job']:
+        if jobs.has_key(j) and jobs[j].has_key('emits'):
+          events_to_show += jobs[j]['emits']
+
+      for j in jobs[job]['stop on']['job']:
+        if jobs.has_key(j) and jobs[j].has_key('emits'):
+          events_to_show += jobs[j]['emits']
+  else:
+    events_to_show = events
+
+  for e in events_to_show:
+    show_event(ofh, e)
+
+
+def show_job(ofh, name):
+  global options
+
+  ofh.write("""
+    %s [shape=\"record\", label=\"<job> %s | { <start> start on | <stop> stop on }\", fontcolor=\"%s\", style=\"filled\", fillcolor=\"%s\"];
+    """ % (mk_job_node_name(name), name, options.color_job_text, options.color_job))
+
+
+def show_jobs(ofh):
+  global jobs
+  global options
+  global restrictions_list
+
+  if restrictions_list:
+    jobs_to_show = restrictions_list
+  else:
+    jobs_to_show = jobs
+
+  for j in jobs_to_show:
+    show_job(ofh, j)
+    # add those jobs which are referenced by existing jobs, but which
+    # might not be available as .conf files. For example, plymouth.conf
+    # references gdm *or* kdm, but you are unlikely to have both
+    # installed.
+    for s in jobs[j]['start on']['job']:
+      if s not in jobs_to_show:
+        show_job(ofh, s)
+
+    for s in jobs[j]['stop on']['job']:
+      if s not in jobs_to_show:
+        show_job(ofh, s)
+
+  if not restrictions_list:
+    return
+
+  # Having displayed the jobs in restrictions_list,
+  # we now need to display all jobs that *those* jobs
+  # start on/stop on.
+  for j in restrictions_list:
+    for job in jobs[j]['start on']['job']:
+      show_job(ofh, job)
+    for job in jobs[j]['stop on']['job']:
+      show_job(ofh, job)
+
+  # Finally, show all jobs which emit events that jobs in the
+  # restrictions_list care about.
+  for j in restrictions_list:
+
+    for e in jobs[j]['start on']['event']:
+      for k in jobs:
+        if e in jobs[k]['emits']:
+          show_job(ofh, k)
+
+    for e in jobs[j]['stop on']['event']:
+      for k in jobs:
+        if e in jobs[k]['emits']:
+          show_job(ofh, k)
+
+
+def show_edge(ofh, from_node, to_node, color):
+  ofh.write("%s -> %s [color=\"%s\"];\n" % (from_node, to_node, color))
+
+
+def show_start_on_job_edge(ofh, from_job, to_job):
+  global options
+  show_edge(ofh, "%s:start" % mk_job_node_name(from_job),
+    "%s:job" % mk_job_node_name(to_job), options.color_start_on)
+
+
+def show_start_on_event_edge(ofh, from_job, to_event):
+  global options
+  show_edge(ofh, "%s:start" % mk_job_node_name(from_job),
+    mk_event_node_name(to_event), options.color_start_on)
+
+
+def show_stop_on_job_edge(ofh, from_job, to_job):
+  global options
+  show_edge(ofh, "%s:stop" % mk_job_node_name(from_job),
+    "%s:job" % mk_job_node_name(to_job), options.color_stop_on)
+
+
+def show_stop_on_event_edge(ofh, from_job, to_event):
+  global options
+  show_edge(ofh, "%s:stop" % mk_job_node_name(from_job),
+    mk_event_node_name(to_event), options.color_stop_on)
+
+
+def show_job_emits_edge(ofh, from_job, to_event):
+  global options
+  show_edge(ofh, "%s:job" % mk_job_node_name(from_job),
+    mk_event_node_name(to_event), options.color_emits)
+
+
+def show_edges(ofh):
+  global events
+  global jobs
+  global options
+  global restrictions_list
+
+  glob_jobs = {}
+
+  if restrictions_list:
+    jobs_list = restrictions_list
+  else:
+    jobs_list = jobs
+
+  for job in jobs_list:
+
+    for s in jobs[job]['start on']['job']:
+      show_start_on_job_edge(ofh, job, s)
+
+    for s in jobs[job]['start on']['event']:
+      show_start_on_event_edge(ofh, job, s)
+
+    for s in jobs[job]['stop on']['job']:
+      show_stop_on_job_edge(ofh, job, s)
+
+    for s in jobs[job]['stop on']['event']:
+      show_stop_on_event_edge(ofh, job, s)
+
+    for e in jobs[job]['emits']:
+      if '*' in e:
+        # handle glob patterns in 'emits'
+        glob_events = []
+        for _e in events:
+          if e != _e and fnmatch.fnmatch(_e, e):
+            glob_events.append(_e)
+        glob_jobs[job] = glob_events
+
+      show_job_emits_edge(ofh, job, e)
+
+    if not restrictions_list:
+      continue
+
+    # Add links to events emitted by all jobs which current job
+    # start/stops on
+    for j in jobs[job]['start on']['job']:
+      if not jobs.has_key(j):
+        continue
+      for e in jobs[j]['emits']:
+        show_job_emits_edge(ofh, j, e)
+
+    for j in jobs[job]['stop on']['job']:
+      for e in jobs[j]['emits']:
+        show_job_emits_edge(ofh, j, e)
+
+  # Create links from jobs (which advertise they emits a class of
+  # events, via the glob syntax) to all the events they create.
+  for g in glob_jobs:
+    for ge in glob_jobs[g]:
+      show_job_emits_edge(ofh, g, ge)
+
+  if not restrictions_list:
+    return
+
+  # Add jobs->event links to jobs which emit events that current job
+  # start/stops on.
+  for j in restrictions_list:
+
+    for e in jobs[j]['start on']['event']:
+      for k in jobs:
+        if e in jobs[k]['emits'] and e not in restrictions_list:
+          show_job_emits_edge(ofh, k, e)
+
+    for e in jobs[j]['stop on']['event']:
+      for k in jobs:
+        if e in jobs[k]['emits'] and e not in restrictions_list:
+          show_job_emits_edge(ofh, k, e)
+
+
+def read_data():
+  global jobs
+  global events
+  global options
+  global cmd
+  global job_events
+
+  if options.infile:
+    try:
+      ifh = open(options.infile, 'r')
+    except:
+      sys.exit("ERROR: cannot read file '%s'" % options.infile)
+  else:
+    try:
+      ifh = Popen(split(cmd), stdout=PIPE).stdout
+    except:
+      sys.exit("ERROR: cannot run '%s'" % cmd)
+
+  for line in ifh.readlines():
+      record = {}
+      line = line.rstrip()
+
+      result = re.match('^\s+start on ([^,]+) \(job:\s*([^,]*), env:', line)
+      if result:
+        _event = encode_dollar(job, result.group(1))
+        _job   = result.group(2)
+        if _job:
+          jobs[job]['start on']['job'][_job] = 1
+        else:
+          jobs[job]['start on']['event'][_event] = 1
+          events[_event] = 1
+        continue
+
+      result = re.match('^\s+stop on ([^,]+) \(job:\s*([^,]*), env:', line)
+      if result:
+        _event = encode_dollar(job, result.group(1))
+        _job   = result.group(2)
+        if _job:
+          jobs[job]['stop on']['job'][_job] = 1
+        else:
+          jobs[job]['stop on']['event'][_event] = 1
+          events[_event] = 1
+        continue
+
+      if re.match('^\s+emits', line):
+        event = (line.lstrip().split())[1]
+        event = encode_dollar(job, event)
+        events[event] = 1
+        jobs[job]['emits'][event] = 1
+      else:
+        tokens = (line.lstrip().split())
+
+        if len(tokens) != 1:
+          sys.exit("ERROR: invalid line: %s" % line.lstrip())
+
+        job_record      = {}
+
+        start_on        = {}
+        start_on_jobs   = {}
+        start_on_events = {}
+
+        stop_on         = {}
+        stop_on_jobs    = {}
+        stop_on_events  = {}
+
+        emits           = {}
+
+        start_on['job']    = start_on_jobs
+        start_on['event']  = start_on_events
+
+        stop_on['job']     = stop_on_jobs
+        stop_on['event']   = stop_on_events
+
+        job_record['start on'] = start_on
+        job_record['stop on']  = stop_on
+        job_record['emits']    = emits
+
+        job = (tokens)[0]
+        jobs[job] = job_record
+
+
+def main():
+  global jobs
+  global options
+  global cmd
+  global default_color_emits
+  global default_color_start_on
+  global default_color_stop_on
+  global default_color_event
+  global default_color_job
+  global default_color_text
+  global default_color_bg
+  global restrictions_list
+
+  description = "Convert initctl(8) output to GraphViz dot(1) format."
+  epilog = \
+    "See http://www.graphviz.org/doc/info/colors.html for available colours."
+
+  parser = OptionParser(description=description, epilog=epilog)
+
+  parser.add_option("-r", "--restrict-to-jobs",
+      dest="restrictions",
+      help="Limit display of 'start on' and 'stop on' conditions to " +
+      "specified jobs (comma-separated list).")
+
+  parser.add_option("-f", "--infile",
+      dest="infile",
+      help="File to read '%s' output from. If not specified, " \
+      "initctl will be run automatically." % cmd)
+
+  parser.add_option("-o", "--outfile",
+      dest="outfile",
+      help="File to write output to (default=%s)" % default_outfile)
+
+  parser.add_option("--color-emits",
+      dest="color_emits",
+      help="Specify color for 'emits' lines (default=%s)." %
+      default_color_emits)
+
+  parser.add_option("--color-start-on",
+      dest="color_start_on",
+      help="Specify color for 'start on' lines (default=%s)." %
+      default_color_start_on)
+
+  parser.add_option("--color-stop-on",
+      dest="color_stop_on",
+      help="Specify color for 'stop on' lines (default=%s)." %
+      default_color_stop_on)
+
+  parser.add_option("--color-event",
+      dest="color_event",
+      help="Specify color for event boxes (default=%s)." %
+      default_color_event)
+
+  parser.add_option("--color-text",
+      dest="color_text",
+      help="Specify color for summary text (default=%s)." %
+      default_color_text)
+
+  parser.add_option("--color-bg",
+      dest="color_bg",
+      help="Specify background color for diagram (default=%s)." %
+      default_color_bg)
+
+  parser.add_option("--color-event-text",
+      dest="color_event_text",
+      help="Specify color for text in event boxes (default=%s)." %
+      default_color_text)
+
+  parser.add_option("--color-job-text",
+      dest="color_job_text",
+      help="Specify color for text in job boxes (default=%s)." %
+      default_color_text)
+
+  parser.add_option("--color-job",
+      dest="color_job",
+      help="Specify color for job boxes (default=%s)." %
+      default_color_job)
+
+  parser.set_defaults(color_emits=default_color_emits,
+  color_start_on=default_color_start_on,
+  color_stop_on=default_color_stop_on,
+  color_event=default_color_event,
+  color_job=default_color_job,
+  color_job_text=default_color_text,
+  color_event_text=default_color_text,
+  color_text=default_color_text,
+  color_bg=default_color_bg,
+  outfile=default_outfile)
+
+  (options, args) = parser.parse_args()
+
+  if options.outfile == '-':
+    ofh = sys.stdout
+  else:
+    try:
+      ofh = open(options.outfile, "w")
+    except:
+      sys.exit("ERROR: cannot open file %s for writing" % options.outfile)
+
+  if options.restrictions:
+    restrictions_list = options.restrictions.split(",")
+
+  read_data()
+
+  for job in restrictions_list:
+    if not job in jobs:
+      sys.exit("ERROR: unknown job %s" % job)
+
+  header(ofh)
+  show_events(ofh)
+  show_jobs(ofh)
+  show_edges(ofh)
+  footer(ofh)
+
+
+if __name__ == "__main__":
+  main()

=== added directory 'scripts/man'
=== added file 'scripts/man/init-checkconf.8'
--- scripts/man/init-checkconf.8	1970-01-01 00:00:00 +0000
+++ scripts/man/init-checkconf.8	2011-06-03 10:15:15 +0000
@@ -0,0 +1,73 @@
+.TH init\-checkconf 8 2011-04-06 "Upstart"
+.\"
+.SH NAME
+init\-checkconf \- manual page for init-checkconf
+.\"
+.SH SYNOPSIS
+.B init\-checkconf
+.RI [ OPTIONS ] " file "
+
+.B init\-checkconf
+.RI [ OPTIONS ] " " "\-f" " file "
+.\"
+.SH DESCRIPTION
+Determine if specified Upstart
+.BR init (8)
+job configuration file is valid.
+.P
+By default, two checks are performed:
+.IP \(bu 4
+Ensure Upstart can parse overall file successfully
+.IP \(bu 4
+Ensure all script sections are parseable by shell
+.P
+.\"
+.SH OPTIONS
+.TP
+.BR \-d " , " \-\-debug
+Show some debug output.
+.TP
+.BR \-f " \fIfile\fP" " , " \-\-file=\fIfile\fP
+Specify job configuration file to check.
+.TP
+.BR \-i " \fIpath\fP" " , " \-\-initctl\-path=\fIpath\fP
+Specify path to
+.BR initctl (8)
+binary.
+.TP
+.BR \-s " , " \-\-noscript
+Do not check script sections.
+.TP
+.BR \-x " \fIpath\fP" " , " \-\-upstart\-path=\fIpath\fP
+Specify path to
+.BR init (8)
+binary.
+.TP
+.BR \-h " , " \-\-help
+Display usage statement.
+.\"
+.SH AUTHOR
+Written by James Hunt
+.RB < [e-mail] >
+.\"
+.SH LIMITATIONS
+.IP \(bu 4
+This program will not run as the root user.
+.IP \(bu 4
+It is not possible for a user to run multiple simultaneous
+instances of this program.
+.\"
+.SH REPORTING BUGS
+Report bugs at
+.RB < https://launchpad.net/upstart/+bugs >
+.\"
+.SH COPYRIGHT
+Copyright \(co 2011 Canonical Ltd.
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.SH SEE ALSO
+.BR sh (1)
+.BR init (5)
+.BR init (8)

=== added file 'scripts/man/initctl2dot.8'
--- scripts/man/initctl2dot.8	1970-01-01 00:00:00 +0000
+++ scripts/man/initctl2dot.8	2011-06-03 10:15:15 +0000
@@ -0,0 +1,87 @@
+.TH initctl2dot 8 2011-03-07 "Upstart"
+.\"
+.SH NAME
+initctl2dot \- manual page for initctl2dot
+.\"
+.SH SYNOPSIS
+.B initctl2dot
+.RI [ OPTIONS ]
+.\"
+.SH DESCRIPTION
+Convert
+.BR initctl (8)
+output to GraphViz
+.BR dot (1)
+format.
+
+With no options,
+.BR initctl (8)
+will be invoked automatically and the output written to file
+\fIupstart.dot\fP.
+.\"
+.SH OPTIONS
+.TP
+.B -h
+Display usage statement.
+.TP
+\fB-f\fP \fIINFILE\fP , \fP--infile\fP=\fIINFILE\fP
+File to read
+.BR initctl (8)
+output from ("initctl show-config -e"). If not specified,
+.BR initctl (8)
+will be run automatically.
+.TP
+\fB-w\fP \fIOUTFILE\fP , \fP--outfile\fP=\fIOUTFILE\fP
+File to write output to.
+.TP
+\fB-r\fP \fIRESTRICTIONS\fP , \fP--restrict-to-jobs\fP=\fIRESTRICTIONS\fP
+Limit display of
+.B start on
+and
+.B stop on
+conditions to comma-separated list of jobs.
+.TP
+\fB--color-emits\fP=\fICOLOR_EMITS\fP
+Specify color for 'emits' lines.
+.TP
+\fB--color-start-on\fP=\fICOLOR_START_ON\fP
+Specify color for 'start on' lines.
+.TP
+\fB--color-stop-on\fP=\fICOLOR_STOP_ON\fP
+Specify color for 'stop on' lines.
+.TP
+\fB--color-event\fP=\fICOLOR_EVENT\fP
+Specify color for event boxes.
+.TP
+\fB--color-text\fP=\fICOLOR_TEXT\fP
+Specify color for summary text.
+.TP
+\fB--color-bg\fP=\fICOLOR_BG\fP
+Specify background color for diagram.
+.TP
+\fB--color-event-text\fP=\fICOLOR_EVENT_TEXT\fP
+Specify color for text in event boxes.
+.TP
+\fB--color-job-text\fP=\fICOLOR_JOB_TEXT\fP
+Specify color for text in job boxes.
+.TP
+\fB--color-job\fP=\fICOLOR_JOB\fP
+Specify color for job boxes.
+.\"
+.SH AUTHOR
+Written by James Hunt
+.RB < [e-mail] >
+.\"
+.SH REPORTING BUGS
+Report bugs at
+.RB < https://launchpad.net/upstart/+bugs >
+.\"
+.SH COPYRIGHT
+Copyright \(co 2011 Canonical Ltd.
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.SH SEE ALSO
+.BR init (8)
+.BR initctl (8)

=== modified file 'util/Makefile.am'
--- util/Makefile.am	2011-03-16 22:49:20 +0000
+++ util/Makefile.am	2011-06-03 10:15:15 +0000
@@ -29,7 +29,7 @@
 	telinit
 
 initctl_SOURCES = \
-	initctl.c
+	initctl.c initctl.h
 nodist_initctl_SOURCES = \
 	$(com_ubuntu_Upstart_OUTPUTS) \
 	$(com_ubuntu_Upstart_Job_OUTPUTS) \

=== modified file 'util/initctl.c'
--- util/initctl.c	2010-02-04 19:08:07 +0000
+++ util/initctl.c	2011-06-03 10:15:15 +0000
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <fnmatch.h>
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -38,10 +39,13 @@
 #include <nih/command.h>
 #include <nih/logging.h>
 #include <nih/error.h>
+#include <nih/hash.h>
+#include <nih/tree.h>
 
 #include <nih-dbus/dbus_error.h>
 #include <nih-dbus/dbus_proxy.h>
 #include <nih-dbus/errors.h>
+#include <nih-dbus/dbus_connection.h>
 
 #include "dbus/upstart.h"
 
@@ -49,6 +53,9 @@
 #include "com.ubuntu.Upstart.Job.h"
 #include "com.ubuntu.Upstart.Instance.h"
 
+#include "../init/events.h"
+#include "initctl.h"
+
 
 /* Prototypes for local functions */
 NihDBusProxy *upstart_open (const void *parent)
@@ -63,6 +70,43 @@
 static void   reply_handler       (int *ret, NihDBusMessage *message);
 static void   error_handler       (void *data, NihDBusMessage *message);
 
+static void   job_class_condition_handler (void *data,
+		NihDBusMessage *message,
+		char ** const *value);
+
+static void   job_class_condition_err_handler (void *data,
+		NihDBusMessage *message);
+
+static void   job_class_parse_events (const ConditionHandlerData *data,
+		char ** const *variant_array);
+
+static void   job_class_show_emits (const void *parent,
+		NihDBusProxy *job_class_proxy, const char *job_class_name);
+
+static void   job_class_show_conditions (NihDBusProxy *job_class_proxy,
+		const char *job_class_name);
+
+static void   eval_expr_tree (const char *expr, NihList **stack);
+
+static int    check_condition (const char *job_class,
+		const char *condition, NihList *condition_list,
+		int *job_class_displayed)
+	__attribute__ ((warn_unused_result));
+
+static int    tree_filter (void *data, NihTree *node);
+
+static void   display_check_errors (const char *job_class,
+		const char *condition, NihTree *node);
+
+static int    allow_job (const char *job);
+static int    allow_event (const char *event);
+
+#ifndef TEST
+
+static int    dbus_bus_type_setter  (NihOption *option, const char *arg);
+static int    ignored_events_setter (NihOption *option, const char *arg);
+
+#endif
 
 /* Prototypes for option and command functions */
 int start_action                (NihCommand *command, char * const *args);
@@ -75,15 +119,26 @@
 int reload_configuration_action (NihCommand *command, char * const *args);
 int version_action              (NihCommand *command, char * const *args);
 int log_priority_action         (NihCommand *command, char * const *args);
-
-
-/**
- * system_bus:
- *
- * Whether to connect to the init daemon on the D-Bus system bus or
- * privately.
- **/
-int system_bus = -1;
+int show_config_action          (NihCommand *command, char * const *args);
+int check_config_action         (NihCommand *command, char * const *args);
+
+
+/**
+ * use_dbus:
+ *
+ * If  1, connect using a D-Bus bus.
+ * If  0, connect using private connection.
+ * If -1, determine appropriate connection based on UID.
+ */
+int use_dbus = -1;
+
+/**
+ * dbus_bus_type:
+ *
+ * D-Bus bus to connect to (DBUS_BUS_SYSTEM or DBUS_BUS_SESSION), or -1
+ * to have an appropriate bus selected.
+ */
+int dbus_bus_type = -1;
 
 /**
  * dest_name:
@@ -107,6 +162,107 @@
  **/
 int no_wait = FALSE;
 
+/**
+ * enumerate_events:
+ *
+ * If TRUE, list out all events/jobs that a particular job *may require* to
+ * be run: essentially any event/job mentioned in a job configuration files
+ * "start on" / "stop on" condition. Used for showing dependencies
+ * between jobs and events.
+ **/
+int enumerate_events = FALSE;
+
+/**
+ * check_config_mode:
+ *
+ * If TRUE, parse all job configuration files looking for unreachable
+ * jobs/events.
+ **/
+int check_config_mode = FALSE;
+
+/**
+ * check_config_warn:
+ *
+ * If TRUE, check-config will generate a warning for *any* unreachable
+ * events/jobs.
+ **/
+int check_config_warn = FALSE;
+
+/**
+ * check_config_data:
+ *
+ * Used to record details of all known jobs and events.
+ **/
+CheckConfigData check_config_data;
+
+/**
+ * NihOption setter function to handle selection of appropriate D-Bus
+ * bus.
+ *
+ * Always returns 1 denoting success.
+ **/
+int
+dbus_bus_type_setter (NihOption *option, const char *arg)
+{
+	nih_assert (option);
+
+	if (! strcmp (option->long_option, "system")) {
+		use_dbus      = TRUE;
+		dbus_bus_type = DBUS_BUS_SYSTEM;
+	}
+	else if (! strcmp (option->long_option, "session")) {
+		use_dbus      = TRUE;
+		dbus_bus_type = DBUS_BUS_SESSION;
+	}
+
+	return 1;
+}
+
+
+/**
+ * NihOption setter function to handle specification of events to
+ * ignore.
+ *
+ * Returns 1 on success, else 0.
+ **/
+int
+ignored_events_setter (NihOption *option, const char *arg)
+{
+	NihError     *err;
+	char        **events;
+	char        **event;
+	NihListEntry *entry;
+
+	nih_assert (option);
+	nih_assert (arg);
+
+	if (! check_config_data.ignored_events_hash)
+		check_config_data.ignored_events_hash = NIH_MUST (nih_hash_string_new (NULL, 0));
+
+	events = nih_str_split (NULL, arg, ",", TRUE);
+
+	if (!events) {
+		goto error;
+	}
+
+	for (event = events; event && *event; ++event) {
+		entry = NIH_MUST (nih_list_entry_new (check_config_data.ignored_events_hash));
+		entry->str = NIH_MUST (nih_strdup (entry, *event));
+		nih_hash_add (check_config_data.ignored_events_hash, &entry->entry);
+	}
+
+	nih_free (events);
+
+	return 1;
+
+error:
+	err = nih_error_get ();
+	nih_error ("%s", err->message);
+	nih_free (err);
+
+	return 0;
+}
+
 
 /**
  * upstart_open:
@@ -132,17 +288,22 @@
 	DBusConnection *connection;
 	NihDBusProxy *  upstart;
 
-	if (system_bus < 0)
-		system_bus = getuid () ? TRUE : FALSE;
+	if (use_dbus < 0)
+		use_dbus = getuid () ? TRUE : FALSE;
+	if (use_dbus >= 0 && dbus_bus_type < 0)
+		dbus_bus_type = DBUS_BUS_SYSTEM;
 
 	dbus_error_init (&dbus_error);
-	if (system_bus) {
+	if (use_dbus) {
 		if (! dest_name)
 			dest_name = DBUS_SERVICE_UPSTART;
 
-		connection = dbus_bus_get (DBUS_BUS_SYSTEM, &dbus_error);
+		connection = dbus_bus_get (dbus_bus_type, &dbus_error);
 		if (! connection) {
-			nih_error ("%s: %s", _("Unable to connect to system bus"),
+			nih_error ("%s: %s",
+				dbus_bus_type == DBUS_BUS_SYSTEM
+				? _("Unable to connect to system bus")
+				: _("Unable to connect to session bus"),
 				   dbus_error.message);
 			dbus_error_free (&dbus_error);
 			return NULL;
@@ -209,7 +370,7 @@
  * of the returned string are freed, the returned string will also be
  * freed.
  *
- * Returns: newly allocated string or NULL on raised error..
+ * Returns: newly allocated string or NULL on raised error.
  **/
 char *
 job_status (const void *  parent,
@@ -663,6 +824,7 @@
 						  (JobClassRestartReply)start_reply_handler,
 						  error_handler, &job_path,
 						  NIH_DBUS_TIMEOUT_NEVER);
+
 		if (! pending_call)
 			goto error;
 	}
@@ -1039,6 +1201,93 @@
 	return 1;
 }
 
+/**
+ * show_config_action:
+ * @command: NihCommand invoked,
+ * @args: command-line arguments.
+ *
+ * This function is called for the "show-config" command.
+ *
+ * Returns: command exit status.
+ **/
+int
+show_config_action (NihCommand *  command,
+	     char * const *args)
+{
+	nih_local NihDBusProxy  *upstart = NULL;
+	nih_local char         **job_class_paths = NULL;
+	const char              *upstart_job_class = NULL;
+	NihError                *err;
+
+	nih_assert (command != NULL);
+	nih_assert (args != NULL);
+
+	upstart = upstart_open (NULL);
+	if (! upstart)
+		return 1;
+
+	if (args[0]) {
+		/* Single job specified */
+		upstart_job_class = args[0];
+		job_class_paths = NIH_MUST (nih_alloc (NULL, 2*sizeof (char *)));
+		job_class_paths[1] = NULL;
+
+		if (upstart_get_job_by_name_sync (NULL, upstart, upstart_job_class,
+					job_class_paths) < 0)
+			goto error;
+	} else {
+		/* Obtain a list of jobs */
+		if (upstart_get_all_jobs_sync (NULL, upstart, &job_class_paths) < 0)
+			goto error;
+	}
+
+	for (char **job_class_path = job_class_paths;
+	     job_class_path && *job_class_path; job_class_path++) {
+		nih_local NihDBusProxy *job_class      = NULL;
+		nih_local char         *job_class_name = NULL;
+
+		job_class = nih_dbus_proxy_new (NULL, upstart->connection,
+						upstart->name, *job_class_path,
+						NULL, NULL);
+		if (! job_class)
+			goto error;
+
+		job_class->auto_start = FALSE;
+
+		if (job_class_get_name_sync (NULL, job_class, &job_class_name) < 0)
+			goto error;
+
+		if (! check_config_mode)
+			nih_message ("%s", job_class_name);
+
+		job_class_show_emits (NULL, job_class, job_class_name);
+		job_class_show_conditions (job_class, job_class_name);
+
+		/* Add any jobs *without* "start on"/"stop on" conditions
+		 * to ensure we have a complete list of jobs for check-config to work with.
+		 */
+		if (check_config_mode) {
+			JobCondition *entry;
+
+			entry = (JobCondition *)nih_hash_lookup (check_config_data.job_class_hash,
+					job_class_name);
+			if (!entry) {
+				MAKE_JOB_CONDITION (check_config_data.job_class_hash,
+						entry, job_class_name);
+				nih_hash_add (check_config_data.job_class_hash, &entry->list);
+			}
+		}
+	}
+
+	return 0;
+
+error:
+	err = nih_error_get ();
+	nih_error ("%s", err->message);
+	nih_free (err);
+
+	return 1;
+}
 
 /**
  * emit_action:
@@ -1216,6 +1465,80 @@
 }
 
 
+/**
+ * check_config_action:
+ * @command: NihCommand invoked,
+ * @args: command-line arguments.
+ *
+ * This function is called for the "check-config" command.
+ *
+ * Returns: command exit status.
+ **/
+int
+check_config_action (NihCommand *command,
+		char * const *args)
+{
+	int              ret;
+	char            *no_args[1] = { NULL };
+	char            *job_class  = NULL;
+
+	check_config_data.job_class_hash = NIH_MUST (nih_hash_string_new (NULL, 0));
+	check_config_data.event_hash     = NIH_MUST (nih_hash_string_new (NULL, 0));
+
+	if (! check_config_data.ignored_events_hash)
+		check_config_data.ignored_events_hash =
+			NIH_MUST (nih_hash_string_new (NULL, 0));
+
+	/* Tell other functions we are running in a special mode */
+	check_config_mode = TRUE;
+
+	/* Obtain emits, start on and stop on data.
+	 *
+	 * Note: we pass null args since we always want details of all jobs.
+	 */
+	ret = show_config_action (command, no_args);
+
+	if (ret)
+		return 0;
+
+	if (args[0]) {
+		NihList *entry;
+		job_class = args[0];
+
+		entry = nih_hash_lookup (check_config_data.job_class_hash, job_class);
+
+		if (! entry) {
+			nih_error ("%s: %s", _("Invalid job class"), job_class);
+			return 1;
+		}
+	}
+
+	NIH_HASH_FOREACH (check_config_data.job_class_hash, iter) {
+		JobCondition *j = (JobCondition *)iter;
+		int job_class_displayed = FALSE;
+
+		if (job_class && strcmp (job_class, j->job_class) != 0) {
+			/* user specified a job on the command-line,
+			 * so only show that one.
+			 */
+			continue;
+		}
+
+		ret += check_condition (j->job_class, "start on", j->start_on,
+				&job_class_displayed);
+
+		ret += check_condition (j->job_class, "stop on" , j->stop_on,
+				&job_class_displayed);
+	}
+
+	nih_free (check_config_data.job_class_hash);
+	nih_free (check_config_data.event_hash);
+	if (! check_config_data.ignored_events_hash)
+		nih_free (check_config_data.ignored_events_hash);
+
+	return ret ? 1 : 0;
+}
+
 static void
 start_reply_handler (char **         job_path,
 		     NihDBusMessage *message,
@@ -1250,6 +1573,635 @@
 	nih_free (err);
 }
 
+/**
+ * job_class_parse_events:
+ * @condition_data: type of condition we are parsing (used as an indicator to
+ * user) and name of job,
+ * @variant_array: pointer to array of variants.
+ *
+ * The array of variants encodes the event operator tree in 
+ * Reverse Polish Notation (RPN).
+ *
+ * Each variant is itself an array. There are two types:
+ *
+ * - An "Operator" (array length == 1).
+ *
+ *   Operators are: "/AND" and "/OR".
+ *
+ * - An "Event" (array length >= 1).
+ *
+ *   Each Event comprises a name (array element zero), followed by zero or
+ *   more "Event Matches". If the first Event Match is of the form "JOB=name",
+ *   or is a single token "name" (crucially not containining "="), then
+ *   'name' refers to the job which emitted the event.
+ **/
+void
+job_class_parse_events (const ConditionHandlerData *data, char ** const *variant_array)
+{
+	char          ** const *variant;
+	char                  **arg;
+	char                   *token;
+	nih_local NihList      *rpn_stack = NULL;
+	char                   *name = NULL;
+	const char             *stanza_name;
+	const char             *job_class_name;
+
+	nih_assert (data);
+
+	stanza_name    = ((ConditionHandlerData *)data)->condition_name;
+	job_class_name = ((ConditionHandlerData *)data)->job_class_name;
+
+	if (! variant_array || ! *variant_array || ! **variant_array)
+		return;
+
+	STACK_CREATE (rpn_stack);
+	STACK_SHOW (rpn_stack);
+
+	for (variant = variant_array; variant && *variant && **variant; variant++, name = NULL) {
+
+		/* token is either the first token beyond the stanza name (ie the event name),
+		 * or an operator.
+		 */
+		token = **variant;
+
+		if (IS_OPERATOR (token)) {
+			/* Used to hold result of combining top two stack elements. */
+			nih_local char *new_token = NULL;
+
+			nih_local NihList *first  = NULL;
+			nih_local NihList *second = NULL;
+
+			if (enumerate_events) {
+				/* We only care about operands in this mode. */
+				continue;
+			}
+
+			if (check_config_mode) {
+				/* Save token verbatim. */
+				new_token = NIH_MUST (nih_strdup (NULL, token));
+				STACK_PUSH_NEW_ELEM (rpn_stack, new_token);
+				continue;
+			}
+
+			first  = NIH_MUST (nih_list_new (NULL));
+			second = NIH_MUST (nih_list_new (NULL));
+
+			/* Found an operator, so pop 2 values off stack,
+			 * combine them and push back onto stack.
+			 */
+			STACK_POP (rpn_stack, first);
+			STACK_POP (rpn_stack, second);
+
+			new_token = NIH_MUST (nih_strdup (NULL, ""));
+			new_token = NIH_MUST (nih_strcat_sprintf (&new_token,
+					NULL,
+					"(%s %s %s)",
+					((NihListEntry *)second)->str,
+					IS_OP_AND (token) ? "and" : "or",
+					((NihListEntry *)first)->str));
+
+			STACK_PUSH_NEW_ELEM (rpn_stack, new_token);
+		} else {
+			/* Save operand token (event or job), add
+			 * arguments (job names and env vars) and push
+			 * onto stack. If we are enumerating_events,
+			 * this records the environment only.
+			 */
+			nih_local char *element = NULL;
+			int i;
+
+			element = NIH_MUST (nih_strdup (NULL,
+						enumerate_events ? "" : token));
+
+			/* Handle arguments (job names and env vars). */
+			arg = (*variant)+1;
+
+			for (i=0; arg[i] && *arg[i]; i++) {
+				if ((enumerate_events || check_config_mode) && IS_JOB_EVENT (token)) {
+					if (!name) {
+						GET_JOB_NAME (name, i, arg[i]);
+						if (name)
+							continue;
+					}
+				}
+
+				if (! check_config_mode) {
+					element = NIH_MUST (nih_strcat (&element, NULL, " "));
+					element = NIH_MUST (nih_strcat (&element, NULL, arg[i]));
+				}
+			}
+
+			if (enumerate_events) {
+				nih_message ("  %s %s (job:%s%s, env:%s)",
+						stanza_name,
+						token,
+						name ? " " : "",
+						name ? name : "",
+						element);
+			} else {
+				if (check_config_mode) {
+					element = NIH_MUST (nih_sprintf (NULL, "%s%s%s",
+								token,
+								name ? " " : "",
+								name ? name : ""));
+				}
+				STACK_PUSH_NEW_ELEM (rpn_stack, element);
+			}
+
+		}
+	}
+
+	if (enumerate_events)
+		return;
+
+	if (check_config_mode) {
+		int add = 0;
+		JobCondition *entry;
+
+		/* Create job class entry if necessary */
+		entry = (JobCondition *)nih_hash_lookup (check_config_data.job_class_hash, job_class_name);
+
+		if (!entry) {
+			add = 1;
+			MAKE_JOB_CONDITION (check_config_data.job_class_hash, entry, job_class_name);
+		}
+
+		/* Unstitch the conditions from the stack and stash them
+		 * in the appropriate list for the job in question.
+		 */
+		NIH_LIST_FOREACH_SAFE (rpn_stack, iter) {
+			NihListEntry *node = (NihListEntry *)iter; 
+			NihList *l = !strcmp (stanza_name, "start on")
+				? entry->start_on
+				: entry->stop_on;
+			nih_ref (node, l);
+			nih_unref (node, rpn_stack);
+			nih_list_add_after (l, &node->entry);
+		}
+
+		if (add)
+			nih_hash_add (check_config_data.job_class_hash, &entry->list);
+
+		return;
+	}
+
+	/* Handle case where a single event was specified (there
+	 * was no operator to pop the entry off the stack).
+	 */
+	if (! STACK_EMPTY (rpn_stack)) {
+		if (! enumerate_events) {
+			/* Our job is done: show the user what we found. */
+			nih_message ("  %s %s", stanza_name,
+					STACK_PEEK (rpn_stack));
+		}
+	}
+}
+
+/**
+ * job_class_show_conditions:
+ * @job_class_proxy: D-Bus proxy for job class.
+ * @job_class_name: Name of config whose conditions we wish to display.
+ *
+ * Register D-Bus call-backs to display job classes start on and stop on
+ * conditions.
+ **/
+void
+job_class_show_conditions (NihDBusProxy *job_class_proxy, const char *job_class_name)
+{
+	DBusPendingCall  *pending_call;
+	NihError         *err;
+	ConditionHandlerData start_data, stop_data;
+
+	nih_assert (job_class_proxy);
+	nih_assert (job_class_name);
+	
+	start_data.condition_name = "start on";
+	start_data.job_class_name = job_class_name;
+
+	stop_data.condition_name  = "stop on";
+	stop_data.job_class_name  = job_class_name;
+
+	pending_call = job_class_get_start_on (job_class_proxy,
+			job_class_condition_handler,
+			job_class_condition_err_handler, 
+			&start_data,
+			NIH_DBUS_TIMEOUT_NEVER);
+
+	if (!pending_call)
+		goto error;
+
+	/* wait for completion */
+	dbus_pending_call_block (pending_call);
+	dbus_pending_call_unref (pending_call);
+
+	pending_call = job_class_get_stop_on (job_class_proxy,
+			job_class_condition_handler,
+			job_class_condition_err_handler, 
+			&stop_data,
+			NIH_DBUS_TIMEOUT_NEVER);
+
+	if (!pending_call)
+		goto error;
+
+	/* wait for completion */
+	dbus_pending_call_block (pending_call);
+	dbus_pending_call_unref (pending_call);
+
+	return;
+
+error:
+	err = nih_error_get ();
+	nih_error ("%s", err->message);
+	nih_free (err);
+}
+
+/**
+ * job_class_show_emits:
+ * @parent: parent object,
+ * @job_class_proxy: D-Bus proxy for job class,
+ * @job_class_name: Name of job class that emits an event.
+ *
+ * Display events job class emits to user.
+ **/
+void
+job_class_show_emits (const void *parent, NihDBusProxy *job_class_proxy, const char *job_class_name)
+{
+	NihError         *err;
+	nih_local char **job_emits = NULL;
+
+	nih_assert (job_class_proxy);
+
+	if (job_class_get_emits_sync (parent, job_class_proxy, &job_emits) < 0) {
+		goto error;
+	}
+
+	if (job_emits && *job_emits) {
+		char **p = job_emits;
+		while (*p) {
+			if (check_config_mode) {
+				/* Record event for later */
+				NihListEntry *node = NIH_MUST (nih_list_entry_new (check_config_data.event_hash));
+				node->str = NIH_MUST (nih_strdup (node, *p));
+				nih_hash_add_unique (check_config_data.event_hash, &node->entry);
+			}
+			else {
+				nih_message ("  emits %s", *p);
+			}
+			p++;
+		}
+	}
+
+	return;
+
+error:
+	err = nih_error_get ();
+	nih_error ("%s", err->message);
+	nih_free (err);
+}
+
+/**
+ * job_class_condition_handler:
+ * @data: data passed via job_class_get_start_on() or job_class_get_stop_on(),
+ * @message: D-Bus message received,
+ * @value: array of variants generated by D-Bus call we are registering
+ * with. 
+ *
+ * Handler for D-Bus message encoding a job classes "start on" or
+ * "stop on" condtions.
+ **/
+void
+job_class_condition_handler (void *data, NihDBusMessage *message, char ** const *value)
+{
+	job_class_parse_events ((const ConditionHandlerData *)data, value);
+}
+
+/**
+ * job_class_condition_err_handler:
+ *
+ * @data data passed via job_class_get_start_on() or job_class_get_stop_on(),
+ * @message: D-Bus message received.
+ *
+ * Error handler for D-Bus message encoding a job classes "start on" or
+ * "stop on" conditions.
+ **/
+void
+job_class_condition_err_handler (void *data, NihDBusMessage *message)
+{
+	/* no remedial action possible */
+}
+
+
+/**
+ * eval_expr_tree:
+ *
+ * @expr: expression to consider (see ExprNode),
+ * @stack: stack used to hold evaluated expressions.
+ *
+ * Evaluate @expr, in the context of @stack, creating ExprNode
+ * nodes as necessary.
+ *
+ * See ExprNode for details of @token.
+ **/
+void
+eval_expr_tree (const char *expr, NihList **stack)
+{
+	NihList *s;
+
+	nih_assert (stack);
+
+	s = *stack;
+
+	if (IS_OPERATOR (expr)) {
+		ExprNode *node, *first, *second;
+		NihListEntry *tmp = NULL;
+		NihListEntry *le;
+
+		/* make node for operator */
+		MAKE_EXPR_NODE (NULL, node, expr);
+
+		/* pop */
+		nih_assert (! NIH_LIST_EMPTY (s));
+		tmp = (NihListEntry *)nih_list_remove (s->next);
+
+		/* re-parent */
+		nih_ref (tmp, node);
+		nih_unref (tmp, s);
+
+		first = (ExprNode *)tmp->data;
+		nih_assert (first->value != -1);
+
+		/* attach to operator node */
+		nih_tree_add (&node->node, &first->node, NIH_TREE_LEFT);
+
+
+		/* pop */
+		nih_assert (! NIH_LIST_EMPTY (s));
+		tmp = (NihListEntry *)nih_list_remove (s->next);
+
+		/* re-parent */
+		nih_ref (tmp, node);
+		nih_unref (tmp, s);
+
+		second = (ExprNode *)tmp->data;
+		nih_assert (second->value != -1);
+
+		/* attach to operator node */
+		nih_tree_add (&node->node, &second->node, NIH_TREE_RIGHT);
+
+
+		/* Determine truth value for
+		 * this node based on children
+		 * and type of operator.
+		 */
+		if (IS_OP_AND (expr) || check_config_warn)
+			node->value = first->value && second->value;
+		else
+			node->value = first->value || second->value;
+
+		/* Create list entry and hook
+		 * node onto it.
+		 */
+		le = NIH_MUST (nih_new (s, NihListEntry));
+		nih_list_init (&le->entry);
+		le->data = node;
+
+		/* push operator node */
+		nih_list_add_after (s, &le->entry);
+
+	} else {
+		char *event = NULL;
+		char *job   = NULL;
+		NihListEntry *le;
+		ExprNode *en;
+		int errors = 0;
+
+		le = NIH_MUST (nih_new (s, NihListEntry));
+		nih_list_init (&le->entry);
+
+		MAKE_EXPR_NODE (le, en, expr);
+		le->data = en;
+
+		event = en->expr;
+
+		/* Determine the type of operand node we
+		 * have.
+		 */
+		job = strchr (en->expr, ' ');
+
+		/* found a job */
+		if (job) {
+			job++;
+			*(job-1) = '\0';
+
+			if (! allow_job (job)) {
+				errors++;
+
+				/* remember the error for later */
+				en->job_in_error = job;
+			}
+		}
+
+		/* handle event */
+		if (! allow_event (event)) {
+			errors++;
+			/* remember the error for later */
+			en->event_in_error = en->expr;
+		}
+
+		/* Determine if this this node is in error (0 means yes) */
+		en->value = errors ? 0 : 1;
+
+		nih_list_add_after (s, &le->entry);
+	}
+}
+
+
+/**
+ * check_condition:
+ *
+ * @job_class: name of job class,
+ * @condition: name of condition,
+ * @condition_list: conditions to check.
+ * @job_class_displayed: Will be set to TRUE when an error node is found
+ * and the job class has been displayed to the user.
+ *
+ * Evaluate all expression tree nodes in @condition_list looking for
+ * errors.
+ *
+ * Returns error count.
+ **/
+int
+check_condition (const char *job_class, const char *condition, NihList *condition_list,
+		int *job_class_displayed)
+{
+	nih_local NihList *stack  = NULL;
+	NihTree           *root   = NULL;
+	int                errors = 0;
+
+	nih_assert (job_class);
+	nih_assert (condition);
+
+	if (! condition_list || NIH_LIST_EMPTY (condition_list))
+		return 0;
+
+	STACK_CREATE (stack);
+	STACK_SHOW (stack);
+
+	NIH_LIST_FOREACH (condition_list, iter) {
+		NihListEntry *e = (NihListEntry *)iter; 
+
+		eval_expr_tree (e->str, &stack);
+	}
+
+	root = &(((ExprNode *)((NihListEntry *)stack->next)->data)->node);
+
+	if (! root)
+		/* no conditions found */
+		return 0;
+
+	/* Look through the expression tree for nodes in error and
+	 * display them.
+	 */
+	NIH_TREE_FOREACH_PRE_FULL (root, iter, tree_filter, root) {
+		ExprNode *e = (ExprNode *)iter;
+
+		if ( e->value != 1 ) {
+			errors++;
+			if ( *job_class_displayed == FALSE) {
+				nih_message ("%s", job_class);
+				*job_class_displayed = TRUE;
+			}
+
+			display_check_errors (job_class, condition, iter);
+			break;
+		}
+	}
+	return errors;
+}
+
+/**
+ * display_check_errors:
+ *
+ * @job_class: name of job class,
+ * @condition: name of condition,
+ * @node: tree node that is in error.
+ *
+ * Display error details from expression tree nodes
+ * that are in error.
+ *
+ * Note that this function should only be passed operand nodes or the
+ * root node.
+ **/
+void
+display_check_errors (const char *job_class, const char *condition, NihTree *node)
+{
+	nih_assert (job_class);
+	nih_assert (node);
+
+	NIH_TREE_FOREACH_POST (node, iter) {
+		ExprNode   *expr  = (ExprNode *)iter;
+		const char *event = expr->event_in_error;
+		const char *job   = expr->job_in_error;
+
+		if (event)
+			nih_message ("  %s: %s %s", condition,
+				_("unknown event"), event);
+
+		if (job)
+			nih_message ("  %s: %s %s", condition,
+				_("unknown job"), job);
+	}
+}
+
+
+/**
+ * tree_filter:
+ *
+ * @data: node representing root of tree,
+ * @node: node to consider.
+ *
+ * Node filter for NIH_TREE_FOREACH_PRE_FULL that ensures only 
+ * operator nodes and the root node are to be considered.
+ *
+ * Returns FALSE if node should be considered, else TRUE.
+ *
+ **/
+int
+tree_filter (void *data, NihTree *node)
+{
+	NihTree  *root = (NihTree *)data;
+	ExprNode *e    = (ExprNode *)node;
+
+	nih_assert (root);
+	nih_assert (e);
+
+	if (IS_OPERATOR (e->expr) || node == root)
+		return FALSE;
+
+	/* ignore */
+	return TRUE;
+}
+
+
+/**
+ * allow_job:
+ *
+ * @job: name of job to check.
+ *
+ * Returns TRUE if @job is recognized or can be ignored,
+ * else FALSE.
+ **/
+int
+allow_job (const char *job)
+{
+	NihList *found;
+
+	nih_assert (job);
+
+	found = nih_hash_lookup (check_config_data.job_class_hash, job);
+
+	/* The second part of this test ensures we ignore the (unusual)
+	 * situation whereby the condition references a
+	 * variable (for example an instance).
+	 */
+	if (!found && job[0] != '$')
+		return FALSE;
+
+	return TRUE;
+}
+
+
+/**
+ * allow_event:
+ *
+ * @event: name of event to check.
+ *
+ * Returns TRUE if @event is recognized or can be ignored,
+ * else FALSE.
+ **/
+int
+allow_event (const char *event)
+{
+	nih_assert (event);
+
+	NIH_HASH_FOREACH (check_config_data.event_hash, iter) {
+		NihListEntry *entry = (NihListEntry *)iter;
+
+		/* handles expansion of any globs */
+		if (fnmatch (entry->str, event, 0) == 0)
+			goto out;
+	}
+
+	if (IS_INIT_EVENT (event) ||
+		nih_hash_lookup (check_config_data.ignored_events_hash, event))
+		goto out;
+
+	return FALSE;
+
+out:
+	return TRUE;
+}
+
 
 #ifndef TEST
 /**
@@ -1258,9 +2210,11 @@
  * Command-line options accepted for all arguments.
  **/
 static NihOption options[] = {
+	{ 0, "session", N_("use D-Bus session bus to connect to init daemon (for testing)"),
+	  NULL, NULL, NULL, dbus_bus_type_setter },
 	{ 0, "system", N_("use D-Bus system bus to connect to init daemon"),
-	  NULL, NULL, &system_bus, NULL },
-	{ 0, "dest", N_("destination well-known name on system bus"),
+	  NULL, NULL, NULL, dbus_bus_type_setter },
+	{ 0, "dest", N_("destination well-known name on D-Bus bus"),
 	  NULL, "NAME", &dest_name, NULL },
 
 	NIH_OPTION_LAST
@@ -1371,6 +2325,32 @@
 
 
 /**
+ * show_config_options:
+ *
+ * Command-line options accepted for the show-config command.
+ **/
+NihOption show_config_options[] = {
+	{ 'e', "enumerate",
+		N_("enumerate list of events and jobs causing job "
+		   "created from job config to start/stop"),
+	  NULL, NULL, &enumerate_events, NULL },
+
+	NIH_OPTION_LAST
+};
+
+/**
+ * check_config_options:
+ *
+ * Command-line options accepted for the check-config command.
+ **/
+NihOption check_config_options[] = {
+	{ 'i', "ignore-events", N_("ignore specified list of events (comma-separated)"),
+	  NULL, "EVENT_LIST", NULL, ignored_events_setter },
+	{ 'w', "warn", N_("Generate warning for any unreachable events/jobs"),
+	  NULL, NULL, &check_config_warn, NULL },
+	NIH_OPTION_LAST
+};
+/**
  * job_group:
  *
  * Group of commands related to jobs.
@@ -1478,10 +2458,27 @@
 	     "Without arguments, this outputs the current log priority."),
 	  NULL, log_priority_options, log_priority_action },
 
+	{ "show-config", N_("[CONF]"),
+	  N_("Show emits, start on and stop on details for job configurations."),
+	  N_("If CONF specified, show configuration details for single job "
+	     "configuration, else show details for all jobs configurations.\n"),
+	  NULL, show_config_options, show_config_action },
+
+	{ "check-config", N_("[CONF]"),
+	  N_("Check for unreachable jobs/event conditions."),
+	  N_("List all jobs and events which cannot be satisfied by "
+	     "currently available job configuration files"),
+	  NULL, check_config_options, check_config_action },
+
+
 	NIH_COMMAND_LAST
 };
 
 
+
+
+
+
 int
 main (int   argc,
       char *argv[])

=== added file 'util/initctl.h'
--- util/initctl.h	1970-01-01 00:00:00 +0000
+++ util/initctl.h	2011-06-03 10:15:15 +0000
@@ -0,0 +1,458 @@
+/* upstart
+ *
+ * Copyright © 2011 Canonical Ltd.
+ * Author: James Hunt <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INITCTL_H
+#define INITCTL_H
+
+/**
+ * IS_OP_AND:
+ * @token: string token to check.
+ *
+ * Return TRUE if @token is an 'AND' operator, else FALSE.
+ **/
+#define IS_OP_AND(token) \
+	(! strcmp ((token), "/AND"))
+
+/**
+ * IS_OP_OR:
+ * @token: string token to check.
+ *
+ * Return TRUE if @token is an 'OR' operator, else FALSE.
+ **/
+#define IS_OP_OR(token) \
+	(! strcmp ((token), "/OR"))
+
+/**
+ * IS_OPERATOR
+ * @token: string token to check.
+ *
+ * Return TRUE if @token is either an 'AND' or an 'OR' operator,
+ * else FALSE.
+ **/
+#define IS_OPERATOR(token) \
+	IS_OP_AND (token) || IS_OP_OR (token)
+
+
+/**
+ * GET_JOB_NAME:
+ *
+ * @var: char pointer variable which will be set to the name
+ * of a job, or NULL,
+ * @index: zero-based index of tokens where zero represents
+ * the first token after the initial token,
+ * @token: string to check.
+ *
+ * Determine name of job considering the specified token and its
+ * index. If not a job, sets @name to NULL.
+ *
+ * Handles the following cases:
+ *
+ *   [start|stop] on <job_event> foo
+ *     (index==0, job="foo" => name="foo")
+ *
+ *   [start|stop] on <job_event> JOB=foo
+ *     (index==0, job="JOB=foo" => name="foo")
+ *
+ *   [start|stop] on <job_event> A=B JOB=foo
+ *     (index==1, job="JOB=foo" => name="foo")
+ *
+ *   [start|stop] on <job_event> A=B c=hello JOB=foo
+ *     (index==2, job="JOB=foo" => name="foo")
+ *
+ *   [start|stop] on <job_event> $JOB A=B c=hello
+ *     (index==0, job="$JOB" => name="$JOB")
+ *
+ **/
+#define GET_JOB_NAME(var, index, token)                              \
+{                                                                    \
+	char *_##var;                                                \
+                                                                     \
+	nih_assert (index >= 0);                                     \
+	nih_assert (token);                                          \
+                                                                     \
+	var = NULL;                                                  \
+                                                                     \
+	_##var = strstr (token, "JOB=");                             \
+                                                                     \
+	if (_##var && _##var == token)                               \
+		var = _##var + strlen ("JOB=");                      \
+	else if (index == 0 ) {                                      \
+		if (!strstr (token, "="))                            \
+			var = token;                                 \
+	}                                                            \
+}
+
+
+/**
+ * IS_JOB_EVENT:
+ * @token: string to check.
+ *
+ * Return TRUE if specified token refers to a standard job event, else
+ * FALSE.
+ **/
+#define IS_JOB_EVENT(token)                     \
+	(!strcmp (token, JOB_STARTING_EVENT) || \
+	 !strcmp (token, JOB_STARTED_EVENT)  || \
+	 !strcmp (token, JOB_STOPPING_EVENT) || \
+	 !strcmp (token, JOB_STOPPED_EVENT))
+
+/**
+ * IS_INIT_EVENT:
+ * @token: string to check.
+ *
+ * Return TRUE if specified token refers to an event emitted internally,
+ * else FALSE.
+ *
+ * Note: the raw string entries below are required to accommodate
+ * 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)  || \
+	 IS_JOB_EVENT (token))
+
+/**
+ * STACK_EMPTY:
+ * @stack: address of stack to check.
+ *
+ * Return TRUE if @stack is empty, else FALSE.
+ **/
+#define STACK_EMPTY(stack) \
+	(NIH_LIST_EMPTY (stack))
+
+/**
+ * STACK_CREATE:
+ * @name: nih_list variable to assign stack to.
+ **/
+#define STACK_CREATE(name) \
+	name = NIH_MUST (nih_list_new (NULL))
+/**
+ * STACK_SHOW_POP:
+ * @stack: Address of stack,
+ * @str: string representing element popped off stack.
+ *
+ * Display message to denote that @str has been popped off @stack.
+ * Does nothing if debug build not enabled.
+ *
+ * Note: we cannot assert that stack is not empty since a caller may
+ * have just removed the last entry before calling us. Thus, it is up to
+ * the caller to perform such checks.
+ *
+ * Does nothing if debug build not enabled.
+ **/
+#ifdef DEBUG_STACK
+#define STACK_SHOW_POP(stack, str) \
+	STACK_SHOW_CHANGE (stack, "popped", str)
+#else
+#define STACK_SHOW_POP(stack, str)
+#endif
+
+/**
+ * STACK_SHOW_PUSH:
+ * @stack: Address of stack,
+ * @str: string representing element pushed onto stack.
+ *
+ * Display message to denote that @str has been pushed onto @stack.
+ *
+ * Does nothing if debug build not enabled.
+ **/
+#ifdef DEBUG_STACK
+#define STACK_SHOW_PUSH(stack, str)              \
+	STACK_SHOW_CHANGE (stack, "pushed", str) \
+	                                         \
+	nih_assert (! STACK_EMPTY (stack))
+#else
+#define STACK_SHOW_PUSH(stack, str)
+#endif
+
+/**
+ * STACK_SHOW:
+ * @stack: Address of stack.
+ *
+ * Display contents of @stack.
+ *
+ * Does nothing if debug build not enabled.
+ **/
+#ifdef DEBUG_STACK
+#define STACK_SHOW(stack)                                     \
+{                                                             \
+	size_t depth = 0;                                     \
+                                                              \
+	nih_assert (stack);                                   \
+                                                              \
+	NIH_LIST_FOREACH (stack, iter) {                      \
+		depth++;                                      \
+	}                                                     \
+                                                              \
+	if (STACK_EMPTY (stack)) {                            \
+		nih_message ("STACK@%p: empty", stack);       \
+	} else {                                              \
+		for (NihList *iter = (stack)->next;           \
+				iter != (stack) &&            \
+				((NihListEntry *)iter)->str;  \
+				iter = iter->next, depth--) { \
+			nih_message ("STACK@%p[%u]='%s'",     \
+				(void *)stack,                \
+				(unsigned int)(depth-1),      \
+				((NihListEntry *)iter)->str); \
+		}                                             \
+	}                                                     \
+}
+#else
+#define STACK_SHOW(stack)
+#endif
+
+/**
+ * STACK_SHOW_CHANGE:
+ * @stack: Address of stack,
+ * @msg: message to show a stack change,
+ * @element_str: string representing element changed on @stack.
+ *
+ * Display a message showing that the stack has been changed.
+ *
+ * Does nothing if debug build not enabled.
+ **/
+#ifdef DEBUG_STACK
+#define STACK_SHOW_CHANGE(stack, msg, element_str) \
+	nih_assert (msg);                          \
+	nih_assert (element_str);                  \
+	                                           \
+	nih_message ("STACK@%p: %s '%s'",          \
+		(void *)stack, msg, element_str);  \
+	                                           \
+	STACK_SHOW (stack);                        \
+	                                           \
+	nih_message (" "); /* spacer */
+#else
+#define STACK_SHOW_CHANGE(stack, msg, element_str)
+#endif
+
+/**
+ * STACK_PUSH:
+ * @stack: Address of stack,
+ * @elem: element of type NihListEntry to add to stack.
+ *
+ * Add @elem to @stack and display message showing how stack changed.
+ **/
+#define STACK_PUSH(stack, elem)                     \
+	nih_list_add_after (stack, &(elem)->entry); \
+	                                            \
+	STACK_SHOW_PUSH (stack,                     \
+		((NihListEntry *)(elem))->str);     \
+	                                            \
+	nih_assert (! STACK_EMPTY (stack))
+
+/**
+ * STACK_PUSH_NEW_ELEM:
+ * @stack: Address of stack,
+ * @string: String to convert into a new NihListEntry
+ * stack element and push onto @stack.
+ *
+ * Create new stack element from @string and push onto @stack,
+ * displaying a message showing how stack changed.
+ **/
+#define STACK_PUSH_NEW_ELEM(stack, string)            \
+{                                                     \
+	NihListEntry *e;                              \
+	                                              \
+	nih_assert (stack);                           \
+	nih_assert (string);                          \
+	                                              \
+	e = NIH_MUST (nih_new (stack, NihListEntry)); \
+	nih_list_init (&e->entry);                    \
+	e->str = NIH_MUST (nih_strdup (e, string));   \
+        STACK_PUSH (stack, e);                        \
+}
+
+/**
+ * STACK_POP:
+ * @stack: Address of stack,
+ * @list: list which top stack element will be added to.
+ *
+ * Remove top element from @stack, returning to caller as @list
+ * and display message showing how stack changed.
+ *
+ * Note that @list is assumed to have had nih_list_new() called
+ * on it already.
+ **/
+#define STACK_POP(stack, list)                     \
+	nih_assert (stack);                        \
+	nih_assert ((stack)->next);                \
+	                                           \
+	list = nih_list_add (list, (stack)->next); \
+	STACK_SHOW_POP (stack,                     \
+		((NihListEntry *)(list))->str)
+
+/**
+ * STACK_PEEK:
+ * @stack: Address of stack.
+ *
+ * Return string value of top element on stack.
+ **/
+#define STACK_PEEK(stack) \
+	(((NihListEntry *)(stack)->next)->str)
+
+/**
+ * JobCondition:
+ *
+ * @list: list that @list lives on,
+ * @job_class: name of job class,
+ * @start_on: start on conditions,
+ * @stop_on: stop on conditions.
+ *
+ * Structure used to represent a job classes start on and stop on
+ * conditions.
+ *
+ * Note that @start_on and @stop_on are lists of NihListEntry
+ * objects containing string data.
+ *
+ *
+ **/
+typedef struct condition {
+	NihList      list;
+
+	const char  *job_class;
+	NihList     *start_on;
+	NihList     *stop_on;
+} JobCondition;
+
+/**
+ * CheckConfigData:
+ *
+ * @job_class_hash: Job classes (.conf files)
+ *   currently installed,
+ * @event_hash: Events that are documented
+ *   as being emitted,
+ * @ignored_events_hash: Rvents we wish to ignore.
+ *
+ * Notes:
+ *
+ * Keys for @job_class_hash are job class names and values
+ * are of type JobCondition.
+ *
+ * Keys of @event_hash are event names and values are of type
+ * NihListEntry holding the event name as a string.
+ *
+ * Keys of @ignored_events_hash are event names and values are of type
+ * NihListEntry holding the event name as a string.
+ **/
+typedef struct check_config_data {
+	NihHash *job_class_hash;
+	NihHash *event_hash;
+	NihHash *ignored_events_hash;
+} CheckConfigData;
+
+
+/**
+ * ConditionHandlerData:
+ *
+ * @condition_name: "start on" or "stop on",
+ * @job_class_name: name of *.conf file less the extension.
+ *
+ * Used to pass multiple values to job_class_get_start_on() /
+ * job_class_get_stop_on() handlers.
+ *
+ **/
+typedef struct condition_handler_data {
+	const char *condition_name;
+	const char *job_class_name;
+} ConditionHandlerData;
+
+
+/**