Merge lp:~upstart-devel/upstart/0.9 into lp:upstart

[James Hunt]

Hi Scott,

Now that the code is stabilising, here forthwith is the "0.9" branch containing the 4 branches we developed for natty...

1) lp:~canonical-scott/upstart/bridges
2) lp:~canonical-scott/upstart/session-support
3) lp:~jamesodhunt/upstart/override-support
4) lp:~jamesodhunt/upstart/upstart-job-visualisation

... with associated fixes to those branches.

Cheers,

James.

[Scott James Remnant (scott)]

Please resubmit as individual merges for each change/set of changes

review: Needs Fixing

[Scott James Remnant (scott)]

Hi James, thanks for getting started on submitting this.

Unfortunately this is a massive merge with a large number of distinct
changes. These need to be submitted individually and separately. What's
more, I suspect that you don't mean to submit some of these changes as they
are Ubuntu-specific. I did a quick pass through the merge output and noted
at least:

 - changes to bash completion
 - indentation fixes (dbus/upstart.h)
 - massive manpage updates
 - supports d-bus session bus connection rather than system
 - disabling/changing of startup of event
 - alternative config dir
 - init-checkconf
 - initctl2dot

 - addition of socket bridge
 - addition of events-with-fds to upstart
 - addition of udev bridge
 - chroot session support
 - user session support
 - override file support

 - addition of "emits" tags to config files

There are also basic problems with this merge:

Text conflict in ChangeLog
Text conflict in NEWS
Text conflict in configure.ac
Text conflict in init/conf.c
Text conflict in init/main.c
Text conflict in po/upstart.pot

The individual submission branches should be cleaned up against trunk first

Scott

On Thu, Apr 14, 2011 at 7:47 AM, James Hunt <email address hidden>wrote:

> James Hunt has proposed merging lp:~upstart-devel/upstart/0.9 into
> lp:upstart.
>
> Requested reviews:
> Upstart Developers (upstart-devel)
>
> For more details, see:
> https://code.launchpad.net/~upstart-devel/upstart/0.9/+merge/57694
>
> Hi Scott,
>
> Now that the code is stabilising, here forthwith is the "0.9" branch
> containing the 4 branches we developed for natty...
>
> 1) lp:~canonical-scott/upstart/bridges
> 2) lp:~canonical-scott/upstart/session-support
> 3) lp:~jamesodhunt/upstart/override-support
> 4) lp:~jamesodhunt/upstart/upstart-job-visualisation
>
> ... with associated fixes to those branches.
>
> Cheers,
>
> James.
> --
> https://code.launchpad.net/~upstart-devel/upstart/0.9/+merge/57694
> Your team Upstart Developers is requested to review the proposed merge of
> lp:~upstart-devel/upstart/0.9 into lp:upstart.
>
> === modified file '.bzrignore'
> --- .bzrignore 2010-12-10 04:03:25 +0000
> +++ .bzrignore 2011-04-14 14:47:25 +0000
> @@ -59,3 +59,7 @@
> util/shutdown
> util/telinit
> util/test_*
> +extra/com.ubuntu.Upstart.[ch]
> +extra/com.ubuntu.Upstart.Job.[ch]
> +extra/upstart-socket-bridge
> +extra/upstart-udev-bridge
>
> === modified file 'ChangeLog'
> --- ChangeLog 2011-03-22 17:53:17 +0000
> +++ ChangeLog 2011-04-14 14:47:25 +0000
> @@ -1,3 +1,4 @@
> +<<<<<<< TREE
> 2011-03-22 Scott James Remnant <email address hidden>
>
> * configure.ac: Bump version to 1.3
> @@ -84,6 +85,414 @@
> the character before the ".conf" extension is not "/"
> * NEWS: Update.
>
> +=======
> [phone] James Hunt <email address hidden>
> +
> + * init/conf.c: conf_select_job(): Added Session parameter.
> + * init/control.c: control_get_job_by_name(): Handle multiple jobs
> with same
> + name (but different session) in job_classes hash.
> + * init/job_class.c:
> + - job_class_remove(): Added Session parameter.
> + - job_class_consider(): Handle multiple jobs with same nam...

[lp:~upstart-devel/upstart/0.9]

1286. By James Hunt on 2011-04-15

* init/conf.c:
  - conf_source_reload_file(): Added missing error return if override
    doesn't parse (code path currently unused).
  - Documentation updates.
* init/job.c: job_new(): Fix for nasty OOM scenario when an attempt is made
  to start a chroot job with same name as running single-instance non-chroot
  job. Previously, the path for a chrooted Job was set from the (nul) instance
  name of its parent JobClass. However, since that job instance name already
  existed outside the chroot and was already D-Bus registered,
  nih_dbus_object_new() (which allocates storage and is called by
  job_register()) returned NULL and kept doing so due to being called
  within NIH_MUST(). This resulted in OOM due to an as-yet unidentified
  D-Bus bug (possibly a leak in find_subtree_recurse()).
* init/session.h: Documentation updates.
* util/test_initctl.c: Cleaned up variable names
  in RUN_COMMAND macro.
* init/parse_job.c: Documentation updates.

1287. By James Hunt on 2011-04-15

* Bumped version to 0.9.6
* Updated Changelog and NEWS.

1288. By James Hunt on 2011-04-20

* control_get_job_by_name: Fix to relax session rigidity for user
  sessions (allow user sessions to see into the global
  namespace for backwards compatability) (LP: #767053).

1289. By James Hunt on 2011-04-20

* Bumped version to 0.9.7
* Updated Changelog and NEWS.

1290. By James Hunt on 2011-04-27

* scripts/init-checkconf.sh:
  - New function upstart_running.
  - We now check to ensure no other instance running.
  - Use list command rather than status since the latter requires an
    instance variable to be specified (LP: #770532).
  - Improve cleanup safety.
* scripts/man/init-checkconf.8: Added limitations section.

1291. By James Hunt on 2011-04-27

Updated changelog.

Unmerged revisions

1291. By James Hunt on 2011-04-27

Updated changelog.

1290. By James Hunt on 2011-04-27

* scripts/init-checkconf.sh:
  - New function upstart_running.
  - We now check to ensure no other instance running.
  - Use list command rather than status since the latter requires an
    instance variable to be specified (LP: #770532).
  - Improve cleanup safety.
* scripts/man/init-checkconf.8: Added limitations section.

1289. By James Hunt on 2011-04-20

* Bumped version to 0.9.7
* Updated Changelog and NEWS.

1288. By James Hunt on 2011-04-20

* control_get_job_by_name: Fix to relax session rigidity for user
  sessions (allow user sessions to see into the global
  namespace for backwards compatability) (LP: #767053).

1287. By James Hunt on 2011-04-15

* Bumped version to 0.9.6
* Updated Changelog and NEWS.

1286. By James Hunt on 2011-04-15

* init/conf.c:
  - conf_source_reload_file(): Added missing error return if override
    doesn't parse (code path currently unused).
  - Documentation updates.
* init/job.c: job_new(): Fix for nasty OOM scenario when an attempt is made
  to start a chroot job with same name as running single-instance non-chroot
  job. Previously, the path for a chrooted Job was set from the (nul) instance
  name of its parent JobClass. However, since that job instance name already
  existed outside the chroot and was already D-Bus registered,
  nih_dbus_object_new() (which allocates storage and is called by
  job_register()) returned NULL and kept doing so due to being called
  within NIH_MUST(). This resulted in OOM due to an as-yet unidentified
  D-Bus bug (possibly a leak in find_subtree_recurse()).
* init/session.h: Documentation updates.
* util/test_initctl.c: Cleaned up variable names
  in RUN_COMMAND macro.
* init/parse_job.c: Documentation updates.

1285. By James Hunt on 2011-04-06

* Bumped version to 0.9.5
* Updated Changelog and NEWS.

1284. By James Hunt on 2011-04-06

* init/conf.c: conf_select_job(): Added Session parameter.
* init/control.c: control_get_job_by_name(): Handle multiple jobs with same
  name (but different session) in job_classes hash.
* init/job_class.c:
  - job_class_remove(): Added Session parameter.
  - job_class_consider(): Handle multiple jobs with same name
    (but different session) in job_classes hash.
  - job_class_reconsider(): Handle multiple jobs with same name
    (but different session) in job_classes hash.
  - job_class_remove(): Handle incorrect session.
* init/job_process.c: job_process_spawn(): Updated for sessions and
  chroots.
* init/job_process.h: New enums for:
  - JOB_PROCESS_ERROR_SETUID
  - JOB_PROCESS_ERROR_SETGID
* init/session.c:
  - session_from_dbus(): Added ability to disable sessions.
  - Added disable_sessions variable, set via main().
* init/session.h: Added tabular comment summarising Session object
  contents for different environments.
* init/Makefile.am: Reverted special-casing for session.c.
* init/main.c: Addition of new command-line option "--no-sessions" to
  disable chroot+user sessions (providing a "traditional" Upstart
  environment. The primary use for this option is the test suite.
* init/man/init.8: Updates for "--no-sessions".
* init/tests/test_*.c: Replaced explicit Sessions with NULL
  session since tests are not yet session-aware (with the exception of
  test_job_process.c, all main() functions now set the
  UPSTART_NO_SESSIONS variable to disable sessions).
* util/tests/test_initctl.c:
  - START_UPSTART now specifies "--no-sessions"
  - test_check_config(): Added test for "--warn".
* scripts/init-checkconf.sh: Script now also checks any script
  sections found unless the new "--noscript" option is specified.
  Added required "--no-sessions" option to upstart_cmd to ensure Upstart
  treats clients requests in traditional manner.
* scripts/man/init-checkconf.8: Update for "--noscript".
* util/initctl.c: Added "--warn" option for check-config command to
  warn if any events or jobs are not known.

1283. By James Hunt on 2011-03-24

* init/tests/test_control.c: Added comment.
* scripts/initctl2dot.py: Fixes to handle 'emits' glob syntax:
  - header(): Change default node to be an event to simplify handling
    globs in 'emits' stanzas.
  - footer(): Updated for glob event nodes.
  - sanitize(): Protect against glob syntax.
  - show_event(): Update for glob event nodes.
  - show_job(): Explicit specification of record node.
  - show_edges(): Handle 'emits' glob syntax.

1282. By James Hunt on 2011-03-15

* po/upstart.pot: committed changes to file to resolve conflict on
  lp:ubuntu/upstart merge.

=== modified file '.bzrignore'
--- .bzrignore	2010-12-10 04:03:25 +0000
+++ .bzrignore	2011-04-27 14:11:41 +0000
@@ -59,3 +59,7 @@
 util/shutdown
 util/telinit
 util/test_*
+extra/com.ubuntu.Upstart.[ch]
+extra/com.ubuntu.Upstart.Job.[ch]
+extra/upstart-socket-bridge
+extra/upstart-udev-bridge

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-22 17:53:17 +0000
+++ ChangeLog	2011-04-27 14:11:41 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2011-03-22  Scott James Remnant  <[e-mail]>
 
 	* configure.ac: Bump version to 1.3
@@ -84,6 +85,450 @@
 	the character before the ".conf" extension is not "/"
 	* NEWS: Update.
 
+=======
[phone]  James Hunt  <[e-mail]>
+
+	* scripts/init-checkconf.sh:
+	  - New function upstart_running.
+	  - We now check to ensure no other instance running.
+	  - Use list command rather than status since the latter requires an
+	    instance variable to be specified (LP: #770532).
+	  - Improve cleanup safety.
+	* scripts/man/init-checkconf.8: Added limitations section.
+
[phone]  James Hunt  <[e-mail]>
+
+	* control_get_job_by_name: Fix to relax session rigidity for user
+	  sessions (allow user sessions to see into the global
+	  namespace for backwards compatability) (LP: #767053).
+
[phone]  James Hunt  <[e-mail]>
+
+	* init/conf.c:
+	  - conf_source_reload_file(): Added missing error return if override
+	    doesn't parse (code path currently unused).
+	  - Documentation updates.
+	* init/job.c: job_new(): Fix for nasty OOM scenario when an attempt is made
+	  to start a chroot job with same name as running single-instance non-chroot
+	  job. Previously, the path for a chrooted Job was set from the (nul) instance
+	  name of its parent JobClass. However, since that job instance name already
+	  existed outside the chroot and was already D-Bus registered,
+	  nih_dbus_object_new() (which allocates storage and is called by
+	  job_register()) returned NULL and kept doing so due to being called
+	  within NIH_MUST(). This resulted in OOM due to an as-yet unidentified
+	  D-Bus bug (possibly a leak in find_subtree_recurse()).
+	* init/session.h: Documentation updates.
+	* util/test_initctl.c: Cleaned up variable names
+	  in RUN_COMMAND macro.
+	* init/parse_job.c: Documentation updates.
+
[phone]  James Hunt  <[e-mail]>
+
+	* init/conf.c: conf_select_job(): Added Session parameter.
+	* init/control.c: control_get_job_by_name(): Handle multiple jobs with same
+	  name (but different session) in job_classes hash.
+	* init/job_class.c:
+	  - job_class_remove(): Added Session parameter.
+	  - job_class_consider(): Handle multiple jobs with same name
+	    (but different session) in job_classes hash.
+	  - job_class_reconsider(): Handle multiple jobs with same name
+	    (but different session) in job_classes hash.
+	  - job_class_remove(): Handle incorrect session.
+	* init/job_process.c: job_process_spawn(): Updated for sessions and
+	  chroots.
+	* init/job_process.h: New enums for: 
+	  - JOB_PROCESS_ERROR_SETUID
+	  - JOB_PROCESS_ERROR_SETGID
+	* init/session.c:
+	  - session_from_dbus(): Added ability to disable sessions.
+	  - Added disable_sessions variable, set via main().
+	* init/session.h: Added tabular comment summarising Session object
+	  contents for different environments.
+	* init/Makefile.am: Reverted special-casing for session.c.
+	* init/main.c: Addition of new command-line option "--no-sessions" to
+	  disable chroot+user sessions (providing a "traditional" Upstart
+	  environment. The primary use for this option is the test suite.
+	* init/man/init.8: Updates for "--no-sessions".
+	* init/tests/test_*.c: Replaced explicit Sessions with NULL
+	  session since tests are not yet session-aware (with the exception of
+	  test_job_process.c, all main() functions now set the
+	  UPSTART_NO_SESSIONS variable to disable sessions).
+	* util/tests/test_initctl.c:
+	  - START_UPSTART now specifies "--no-sessions"
+	  - test_check_config(): Added test for "--warn".
+	* scripts/init-checkconf.sh: Script now also checks any script
+	  sections found unless the new "--noscript" option is specified.
+	  Added required "--no-sessions" option to upstart_cmd to ensure Upstart
+	  treats clients requests in traditional manner.
+	* scripts/man/init-checkconf.8: Update for "--noscript".
+	* util/initctl.c: Added "--warn" option for check-config command to
+	  warn if any events or jobs are not known.
+
[phone]  James Hunt  <[e-mail]>
+
+	* init/tests/test_control.c: Added comment.
+	* scripts/initctl2dot.py: Fixes to handle 'emits' glob syntax:
+	  - header(): Change default node to be an event to simplify handling
+	    globs in 'emits' stanzas.
+	  - footer(): Updated for glob event nodes.
+	  - sanitize(): Protect against glob syntax.
+	  - show_event(): Update for glob event nodes.
+	  - show_job(): Explicit specification of record node.
+	  - show_edges(): Handle 'emits' glob syntax.
+
[phone]  James Hunt  <[e-mail]>
+
+	* configure.ac: Bump version to 0.9.3.
+	* NEWS: Entry for version 0.9.3.
+	* conf/rc-sysinit.conf: Added emits stanza for runlevel event.
+	* extra/conf/upstart-socket-bridge.conf: Added emits stanza for socket
+	  event.
+	* extra/conf/upstart-udev-bridge.conf: Added emits stanza for udev class
+	  of events (using globs).
+	* init/man/init.5: Updated emits stanza section to explain use of
+	  wildcard characters.
+	* util/initctl.c:
+	  - New functions:
+	    - allow_job(): Determine if specified job is erroneous or not.
+	      Handles variables (such as instance variables).
+	    - allow_event(): Determine if specified event is erroneous or not.
+	      Handles globbing.
+	  - eval_expr_tree():
+	    - Added calls to allow_job() and allow_event().
+	    - Slight simplification of operand-handling code.
+	* util/tests/test_initctl.c: Simplification of dbus_configured().
+
[phone]  James Hunt  <[e-mail]>
+
+	* scripts/Makefile.am: Install improvements for
+	  "make distcheck". Added uninstall for scripts.
+
[phone]  James Hunt  <[e-mail]>
+
+	* extra/conf/upstart-socket-bridge.conf: Start as soon as networking is
+	  available.
+	* extra/man/socket-event.7: Minor typo fixes and troff quoting for
+	  dashes.
+	* extra/man/upstart-socket-bridge.8: Removed reference to socket(8) and
+	  replaced with socket-event(7).
+	* extra/man/upstart-udev-bridge.8: Minor typo fixes, troff quoting for
+	  dashes, and replaced literal quotes with troff quotes.
+	* init/control.c: Typo.
+	* init/main.c: Corrected indentation.
+	* init/man/init.5: Minor typo fixes, troff quoting for
+	  dashes, and replaced literal quotes with troff quotes.
+	* init/man/init.8: Typo.
+	* scripts/init-checkconf.sh: Fixed to ensure safety and portability:
+	    - Quoted all variables.
+	    - Removed non-portable syntax.
+	    - Changed to using getopt(1) rather than getopts(1), and added
+	      long-options.
+	* scripts/initctl2dot.py:
+	    - Changed from os.popen() to (safer)
+	      subprocess.Popen()
+	    - Formatting and typos.
+	* util/initctl.c: Typo.
+	* util/man/initctl.8: Minor typo fixes, troff quoting for
+	  dashes, and replaced literal quotes with troff quotes.
+	* util/tests/test_initctl.c:
+	  - START_UPSTART: improved comments and minor tidyup.
+	  - test_show_config(): Placed tests for expected number of lines of
+	    output *after* checking expected line values. This ensures that if
+	    problems are encountered (for example D-Bus issues), the person
+	    viewing the log has a hope of working out what went wrong :-)
+	  - test_check_config(): As test_show_config().
+	  - dbus_configured(): New function that performs a highly rudimentary
+	    check to see if D-Bus appears to be configured for the environment
+	    the tests run in.
+	  - main(): Improved test for running tests within a chroot: we do now
+	    run all tests assuming that D-Bus is found to be working within a
+	    chroot environment.
+
[phone]  James Hunt  <[e-mail]>
+
+	* extra/man/upstart-udev-bridge.8: Added examples.
+	* extra/Makefile.am: Create links to upstart-udev-bridge
+          man page for well-known Upstart udev events.
+	* util/initctl.h: Improved comments for CheckConfigData.
+	* scripts/init-checkconf.sh:
+	  - cleanup(): Make use of $upstart_pid.
+	  - main(): disown $upstart_pid to stop newer bash versions
+	    displaying changed child process status.
+	* scripts/init2dot.py:
+	  - Removed erroneous check option.
+	  - Improved exaplanation of '-r' option.
+	* scripts/Makefile.am: Added manual pages.
+	* scripts/man/init-checkconf.8: New manual page.
+	* scripts/man/initctl2dot.8: New manual page.
+
[phone]  James Hunt  <[e-mail]>
+
+	* contrib/Makefile.am: Fixed paths and names for scripts.
+	* extra/Makefile.am: Update for upstart-socket-bridge.
+	* util/tests/test_initctl.c:
+	    - in_chroot(): New function to detect if in chroot environment.
+	    - main(): Call in_chroot() to work around bug lp:728988.
+	    - START_UPSTART(): Only try to connect 10 times. Don't use
+	      upstart_open() since this uses the system bus whereas we care
+	      about the session bus. Removed "--debug" as this confuses the
+	      log output.
+	* Moved scripts from "contrib/utils/" to "scripts/" and ensured they
+	  now install on "make install".
+	* Makefile.am: Added scripts directory.
+	* configure.ac: Added scripts/Makefile.   
+	* Packaging changes for socket bridge.
+
[phone]  James Hunt  <[e-mail]>
+
+	* extra/man/socket-event.7: Man page for new socket event.
+	* extra/man/upstart-socket-bridge.8: Man page for socket bridge.
+	* upstart-socket-bridge.conf: configuration file for socket
+	  bridge.
+	* contrib/bash_completion/upstart: Updated for new initctl commands
+	 "show-config" and "check-config".
+	* contrib/utils/init-check.sh: Script to determine if the
+	  specified job configuration file (located outside of /etc/init/)
+	  is valid or not.
+	* contrib/utils/initctl2dot.py: Simply Python script to convert new initctl
+	  output to GraphViz dot format. Example usage:
+	    initctl2dot.py -o - | dot -Tpng -o upstart.png
+	* init/control.h: New define for USE_SESSION_BUS_ENV.
+	* init/control.c:
+	  - control_handle_bus_type(): New function to allow selection of
+	    session bus via env var "UPSTART_USE_SESSION_BUS" (for testing).
+	  - control_bus_open(): Connect to either D-Bus system bus or session bus.
+	* init/man/init.8: Updated for --confdir, --session, --no-startup-event
+	  and --startup-event.
+	* init/main.c:
+	  - Added new options '--startup-event' and '--no-startup-event'.
+	  - Addition of --session and --confdir command-line option (required for
+	    test framework to test changes to initctl).
+	  - handle_confdir(): New function to select alternate confdir using env
+	    var "UPSTART_CONFDIR" (for testing).
+	* init/paths.h:
+	  - Renamed CONDIR to DEFAULT_CONFDIR to make its use clearer now it can be changed.
+	  - Renamed CONFILE to DEFAULT_CONFFILE for parity with DEFAULT_CONFDIR.
+	  - Added define for CONFDIR_ENV.
+	* util/initctl.c:
+	  - Addition of --session command-line option (required for test framework to test
+	    visualisation changes to initctl).
+	  - Changed 'system_bus' variable to 'use_dbus' since now we can use either D-Bus bus type.
+	  - Added 'dbus_bus_type' which encodes D-Bus bus type to use.
+	  - Added 'verbose_detail' and 'enumerate_events' variables to 
+	  - Created new functions:
+	    - show_config_action(): New function to handle 'show-config' command.
+	    - 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.
+	    - dbus_bus_type_setter(): Used by option parser to distinguish system/session
+	      D-Bus bus type.
+	    - New functions for check-config command;
+	      - check_config_action: Handler for new check-config command-line
+	        option.
+	      - ignored_events_setter(): handler for '--ignore-events' command-line
+	        option for check-config command.
+	      - eval_expr_tree(): Evaluate expression tree.
+	      - check_condition(): High-level function to handle checking start
+	        on/stop on conditions.
+	      - tree_filter(): Used for filtering expression tree nodes.
+	      - display_check_errors():
+	  - Updated upstart_open() to handle multiple D-Bus bus types.
+	  - status_action() and list_action() modified to call:
+	    - job_class_show_emits()
+	    - job_class_show_conditions()
+	* util/initctl.h: New file providing:
+	  - stack-handling functionality for RPN parsing
+	  - New macros:
+	    - GET_JOB_NAME(): Determine if specified token refers to a job and
+	      return it if true.
+	    - IS_INIT_EVEN(): Determine if specified event is an internally
+	      generated event.
+	    - MAKE_EXPR_NODE(): Create an ExprNode object.
+	    - MAKE_JOB_CONDITION(): Create a JobCondition object.
+	  - New types required for check-config command:
+	    - CheckConfigData
+	    - JobCondition
+	    - ConditionHandlerData
+	    - ExprNode
+	* util/man/initctl.8:
+	  - Updated for show-config section showing new "--enumerate" format output.
+	  - Added section for check-config command.
+	* util/tests/test_initctl.c:
+	  - added test_show_config() and test_check_config().
+	  - new macros START_UPSTART, STOP_UPSTART, RUN_COMMAND, CREATE_FILE
+	    and DELETE_FILE. These are required since due to the changes in initctl.c, we
+	    actually need to run the initctl binary directly (as that is where all
+	    the emits/start on/stop on parsing occurs). The test stategy adopted is to run
+	    (a second instance of! :-) Upstart as a non-privileged user
+	    connected to the session bus and using an alternate config
+	    directory. Then, by invoking initctl, again connecting to the session
+	    bus, we test the parsing functionality directly.
+
[phone]  James Hunt  <[e-mail]>
+
+	* Fixes to allow "make check" to pass with Session support.
+
[phone]  James Hunt  <[e-mail]>
+
+	* Override file support.
+
[phone]  James Hunt <[e-mail]>
+
+	* contrib/bash_completion/upstart: Updated for new initctl show-config
+	  command. 
+	* contrib/utils/init-checkconf.sh: Added '-i' option to specify path to
+	  init daemon (for test builds). Ensure conf file exists.
+	* contrib/utils/initctl2dot.py: Updated for changed initctl show-config
+	  output.
+	* util/Makefile.am: Added missing initctl.h to initctl_SOURCES.
+	* util/initctl.c:
+	  - New functions to handle new check-config command.
+	    - check_config_action: Handler for new check-config command-line
+	      option.
+	    - ignored_events_setter(): handler for '--ignore-events' command-line
+	      option for check-config command.
+	    - eval_expr_tree(): Evaluate expression tree.
+	    - check_condition(): High-level function to handle checking start
+	      on/stop on conditions.
+	    - tree_filter(): Used for filtering expression tree nodes.
+	    - display_check_errors():
+	  - Removed ENSURE_ROOT() macros since this would conflict with user
+	    sessions.
+	* util/initctl.h:
+	  - New macros:
+	    - GET_JOB_NAME(): Determine if specified token refers to a job and
+	      return it if true.
+	    - IS_INIT_EVEN(): Determine if specified event is an internally
+	      generated event.
+	    - MAKE_EXPR_NODE(): Create an ExprNode object.
+	    - MAKE_JOB_CONDITION(): Create a JobCondition object.
+	  - New types required for check-config command:
+	    - CheckConfigData
+	    - JobCondition
+	    - ConditionHandlerData
+	    - ExprNode
+	* util/man/initctl.8:
+	  - Updated for show-config section showing new "--enumerate" format output.
+	  - Added section for check-config command.
+	* util/tests/test_initctl.c:
+	  - START_UPSTART(): Improved test to ensure Upstart has actually
+	    started.
+	  - STOP_UPSTART(): Improved test to ensure Upstart has actually
+	    stopped.
+	  - test_show_config(): Updated for new show-config --enumerate syntax.
+	  - test_check_config(): New function to test check-config command.
+
[phone]  James Hunt <[e-mail]>
+
+	* contrib/utils/init-check.sh renamed to init-checkconf.sh.
+	* contrib/utils/initct2dot.py:
+	  - updated to call "initctl show-config" 
+	  - Added options to allow specification of all colo(u)rs.
+	  - Added a '--restrict-to-jobs' option to allow a sub-set of all jobs
+	    to be viewed (along with their associated jobs and events).
+	  - Code refactored.
+	* init/main.c:
+	  - Added new options '--startup-event' and '--no-startup-event'.
+	* init/man/init.8: Updated for "initctl show-status".
+	* util/initctl.c:
+	  - Reworked code so that rather than utilizing existing 'list' and
+	    'status' commands, we now have a new command: 'show-status'. This is
+	    more logical since it is obvious what it is doing and it also
+	    doesn't pollute the dynamic data returned by 'status' and 'list' with
+	    purely static info.
+	  - upstart_open(): Improved dbus_bus_type usage (now only default to
+	    system bus).
+	  - show_config_action(): New function to handle 'show-config' command.
+	  - job_class_parse_events(): Fixed uninitialized variable issue and
+	    removed IS_JOB() macro in favour of the ultimately reliable
+	    IS_JOB_EVENT() macro.
+	* util/initctl.h: Only enable stack debugging if DEBUG_STACK defined.
+	  This ensures that "make check" doesn't fail due to stack DEBUG output.
+	* util/man/initctl.8: Updated for new 'show-config' command.
+	* util/tests/test_initctl.c:
+	  - Improved START_UPSTART() and STOP_UPSTART() macros.
+	  - Renamed test_status_and_list_action_detail() to
+	    test_show_config_action() to reflect the new command under test.
+	  - test_show_config_action(): Removed all (now-redundant) tests calling
+	    "initctl status" and "initctl list" and updated for new 'show-config'
+	    command.
+
[phone]  James Hunt <[e-mail]>
+
+	* contrib/bash_completion/upstart: Update for job visualisation.
+	* contrib/utils/init-check.sh: Script to determine if the
+	  specified job configuration file (located outside of /etc/init/)
+	  is valid or not.
+	* contrib/utils/initctl2dot.py: Simple Python script to convert new initctl
+	  output to GraphViz dot format. Example usage:
+	    initctl2dot.py > upstart.dot && dot -Tpng -o upstart.png upstart.dot
+	* dbus/upstart.h: Whitespace fix.
+	* init/control.c:
+	  - control_handle_bus_type(): New function to allow selection of
+	    session bus via env var "UPSTART_USE_SESSION_BUS" (for testing).
+	  - control_bus_open(): Connect to either D-Bus system bus or session bus.
+	* init/control.h: New define for USE_SESSION_BUS_ENV.
+	* init/man/init.8: Update for --confdir and --session.
+	* init/main.c:
+	  - Addition of --session and --confdir command-line option (required for
+	    test framework to test changes to initctl).
+	  - handle_confdir(): New function to select alternate confdir using env
+	    var "UPSTART_CONFDIR" (for testing).
+	* init/paths.h:
+	  - Renamed CONDIR to DEFAULT_CONFDIR to make its use clearer now it can be changed.
+	  - Renamed CONFILE to DEFAULT_CONFFILE for parity with DEFAULT_CONFDIR.
+	  - Added define for CONFDIR_ENV.
+	* util/initctl.c:
+	  - Addition of --session command-line option (required for test framework to test
+	    visualisation changes to initctl).
+	  - Changed 'system_bus' variable to 'use_dbus' since now we can use either D-Bus
+	    bus type.
+	  - Added 'dbus_bus_type' which encodes D-Bus bus type to use.
+	  - Added 'verbose_detail' and 'enumerate_events' variables to 
+	  - Created 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.
+	    - dbus_bus_type_setter(): Used by option parser to distinguish system/session
+	      D-Bus bus type.
+	  - Updated upstart_open() to handle multiple D-Bus bus types.
+	  - Changed following functions to error with message if initctl run as
+	    non-root user (without this, you get a very cryptic D-Bus error):
+	    - start_action()
+	    - stop_action()
+	    - restart_action()
+	    - reload_configuration_action()
+	    - log_priority_action()
+	  - status_action() and list_action() modified to call:
+	    - job_class_show_emits()
+	    - job_class_show_conditions()
+	* util/initctl.h: New file providing stack-handling functionality for RPN parsing.
+	* util/initctl.8: Updated for --session, and --detail/-d and
+	  --enumerate/-e options to status and list commands.
+	* 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 changes in initctl.c, we
+	    actually need to run the initctl binary directly (as that is where all
+	    the emits/start on/stop on parsing occurs). The test stategy adopted is to run
+	    (a second instance of! :-) Upstart as a non-privileged user
+	    connected to the session bus and using an alternate config
+	    directory. Then, by invoking initctl, again connecting to the session
+	    bus, we test the parsing functionality directly.
+	  - test_status_and_list_action_detail(): New function to test '-d' and
+	    '-e' options for status and list commands.
+	  - updated all remaining functions to use 'use_dbus' rather than 'system_bus'.
+
+>>>>>>> MERGE-SOURCE
 2011-01-06  Petr Lautrbach  <[e-mail]>
 
 	* init/job_process.c (job_process_termianted): Don't rewind the
@@ -144,6 +589,14 @@
 
 2010-12-10  Scott James Remnant  <[e-mail]>
 
+	* Socket bridge and udev bridge support.
+
[phone]  Scott James Remnant  <[e-mail]>
+
+	* Session support (chroots, sessions and user-session).
+
[phone]  Scott James Remnant  <[e-mail]>
+
 	* dbus/upstart.h (DBUS_SERVICE_UPSTART, DBUS_ADDRESS_UPSTART):
 	For debugging purposes, when -DDEBUG is given, change the values of
 	these constants.  You'll need to modify your own D-Bus configuration

=== modified file 'Makefile.am'
--- Makefile.am	2010-02-04 03:42:29 +0000
+++ Makefile.am	2011-04-27 14:11:41 +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 extra conf doc contrib po scripts
 
 EXTRA_DIST = HACKING
 

=== modified file 'NEWS'
--- NEWS	2011-03-22 17:53:17 +0000
+++ NEWS	2011-04-27 14:11:41 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 1.3  xxxx-xx-xx
 
 1.2  2011-03-22  "This sort of thing is my bag, baby"
@@ -31,6 +32,83 @@
 
 	* Fixed an assertion when a file named /etc/init/.conf is created.
 	  Discovered by Коренберг Марк (Bug: #720573)
+=======
+0.9.7  2011-04-20
+
+	* Fix for user sessions to retain backwards compatibility behaviour
+	  where a non-privileged user can enquire on jobs owned by the
+	  global namespace.
+
+0.9.6  2011-04-15
+
+	* Fix for nasty OOM scenario when an attempt is made to start
+	  a chroot job with same name as running single-instance
+	  non-chroot job. Previously, the path for a chrooted Job
+	  was set from the (nul) instance name of its parent JobClass.
+	  However, since that job instance name already existed
+	  outside the chroot and was already D-Bus registered,
+	  nih_dbus_object_new() (which allocates storage and is
+	  called by job_register()) returned NULL and kept doing so
+	  due to being called within NIH_MUST(). This resulted in
+	  OOM due to an as-yet unidentified D-Bus bug (possibly a
+	  leak in find_subtree_recurse()).
+
+0.9.5  2011-04-06
+
+	* Important fixes for user and chroot sessions.
+	* scripts/init-checkconf.sh: Now checks script sections too.
+	* util/initctl.c: Added "--warn" option for check-config command
+	  to warn if any events or jobs are not known.
+
+0.9.4  2011-03-24
+
+	* scripts/initctl2dot.py: Fix to handle 'emits' glob syntax
+	  which was causing script to fail for upstart-udev-bridge.
+
+0.9.3  2011-03-15
+
+	* Added missing emits stanzas for supplied .conf files.
+
+	* Added wildcard/globbing facility to initctl.c (for check-config
+	  command).
+
+	* Updated man page on emits stanza syntax.
+
+0.9.2  2011-03-11
+
+	* Improvements to existing documentation.
+	* scripts/man/init-checkconf.8: New manual page.
+	* scripts/man/initctl2dot.8: New manual page.
+	* packaging improvements (including "make distcheck" fix).
+	* extra/man/upstart-udev-bridge.8: Added examples.
+	* extra/Makefile.am: Create links to upstart-udev-bridge
+          man page for well-known Upstart udev events.
+
+0.9.1  2011-03-03
+
+	* Added supporting documentation for upstart-socket-bridge and
+	  sessions and chroot support.
+
+	* Added job configuration file for upstart-socket-bridge.
+
+	* Added job/event visualisation support. This comprises a new
+	  initctl command, "show-config" which generates human-readable
+	  (and machine parseable) output showing start on, stop on and
+	  emits details for each job. See initctl.8 for further details.
+	  The output from show-config is used by the new script
+	  contrib/utils/initctl2dot.py which graphs the data in GraphViz
+	  format.
+
+	* Added new initctl command check-config allowing unreachable
+	  job conditions to be detected. See initctl.8 for further
+	  details.
+
+	* Added script contrib/utils/init-checkconf.sh which allows
+	  non-privileged users to check job configuration files for syntax
+	  errors prior to installing in /etc/init/.
+
+0.9.0  2011-02-24
+>>>>>>> MERGE-SOURCE
 
 	* utmp entries will be replaced with DEAD_PROCESS ones when a
 	  pid supervised by Upstart terminates.  (Bug: #183729)
@@ -41,6 +119,29 @@
 	* Included bash completion script in contrib directory.
           (Bug: #672067)
 
+	* Addition of Session support (chroots, sessions and
+	  user-session).
+
+	* Socket bridge support allowing jobs to be started based on
+	  socket connections. Examples of supported syntax:
+
+		start on socket PROTO=inet PORT=1234
+		start on socket PROTO=unix PATH=/var/run/.s.pgsql.1234
+		start on socket PROTO=unix PATH=@/at/upstart/example
+
+	* udev bridge support imported from Ubuntu. See
+	  "man 8 upstart-udev-bridge" for further details.
+
+	* Override file support allowing the creation of files named
+	  "<job_conf>.override" whose contents override that found in
+	  "<job_conf>.conf". Useful to modify a job without touching its
+	  .conf file. For example, a job can now be disabled simply by
+	  doing:
+
+		echo "manual" >> /etc/init/jobname.override
+
+	  See "man 5 init" for further details.
+
 0.6.7  2010-12-14  "Return of the Mole"
 
 	* A new "manual" stanza has been added to the configuration, this

=== modified file 'conf/rc-sysinit.conf'
--- conf/rc-sysinit.conf	2010-02-04 03:59:06 +0000
+++ conf/rc-sysinit.conf	2011-04-27 14:11:41 +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-04-27 14:11:41 +0000
@@ -1,8 +1,13 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
+<<<<<<< TREE
 AC_INIT([upstart], [1.3], [[e-mail]])
 NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Google Inc., Canonical Ltd.]])
+=======
+AC_INIT([upstart], [0.9.7], [[e-mail]])
+NIH_COPYRIGHT([[Copyright © 2011 Canonical Ltd.]])
+>>>>>>> MERGE-SOURCE
 AC_CONFIG_SRCDIR([init/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -30,6 +35,9 @@
 PKG_CHECK_MODULES([NIH], [libnih >= 1.0.2])
 PKG_CHECK_MODULES([NIH_DBUS], [libnih-dbus >= 1.0.0])
 PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
+PKG_CHECK_MODULES([UDEV], [libudev >= 146], [have_udev=yes], [have_udev=no])
+
+AM_CONDITIONAL([HAVE_UDEV], [test "$have_udev" = yes])
 
 # Checks for header files.
 AC_CHECK_HEADERS([valgrind/valgrind.h])
@@ -63,7 +71,8 @@
 
 
 AC_CONFIG_FILES([ Makefile intl/Makefile
-		  dbus/Makefile init/Makefile util/Makefile conf/Makefile
-		  doc/Makefile contrib/Makefile po/Makefile.in ])
+		  dbus/Makefile init/Makefile util/Makefile extra/Makefile
+		  conf/Makefile 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-04-27 14:11:41 +0000
@@ -3,7 +3,7 @@
 #
 # We don't provide completion for 'init' itself for obvious reasons.
 have initctl &&
-_upstart_conf_events()
+_upstart_conf_jobs()
 {
   initctl list|awk '{print $1}'
 } &&
@@ -13,7 +13,7 @@
 } &&
 _upstart_events()
 {
-  (_upstart_conf_events;_upstart_named_events)|tr ' ' '\n'|sort -u
+  (_upstart_conf_jobs;_upstart_named_events)|tr ' ' '\n'|sort -u
 } &&
 _upstart_startable_events()
 {
@@ -46,8 +46,32 @@
       return 0
     ;;
 
-    reload|restart|status)
-      COMPREPLY=( $(compgen -W "$(_upstart_conf_events)" -- ${cur}) )
+    -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 "${vis_opts} $(_upstart_conf_jobs)" -- ${cur}) )
+          return 0
+        fi
+      done
+    ;;
+
+    reload|restart)
+      COMPREPLY=( $(compgen -W "$(_upstart_conf_jobs)" -- ${cur}) )
+      return 0
+    ;;
+
+    status)
+      COMPREPLY=( $(compgen -W "${vis_opts} $(_upstart_conf_jobs)" -- ${cur}) )
+      return 0
+    ;;
+
+    show-config)
+      COMPREPLY=( $(compgen -W "-e --enumerate $(_upstart_conf_jobs)" -- ${cur}) )
       return 0
     ;;
 
@@ -71,7 +95,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 +108,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
@@ -104,7 +128,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
@@ -124,7 +148,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
@@ -145,7 +169,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)
@@ -165,7 +189,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)

=== added directory 'contrib/utils'
=== modified file 'dbus/Upstart.conf'
--- dbus/Upstart.conf	2009-07-02 17:46:41 +0000
+++ dbus/Upstart.conf	2011-04-27 14:11:41 +0000
@@ -9,12 +9,14 @@
     <allow own="com.ubuntu.Upstart" />
   </policy>
 
-  <!-- Permit the root user to invoke all of the methods on Upstart, its jobs
-       or their instances, and to get and set properties. -->
-  <policy user="root">
+  <!-- Allow any user to invoke all of the methods on Upstart, its jobs
+       or their instances, and to get and set properties - since Upstart
+       isolates commands by user. -->
+  <policy context="default">
+    <allow send_destination="com.ubuntu.Upstart"
+	   send_interface="org.freedesktop.DBus.Introspectable" />
     <allow send_destination="com.ubuntu.Upstart"
 	   send_interface="org.freedesktop.DBus.Properties" />
-
     <allow send_destination="com.ubuntu.Upstart"
 	   send_interface="com.ubuntu.Upstart0_6" />
     <allow send_destination="com.ubuntu.Upstart"
@@ -22,36 +24,4 @@
     <allow send_destination="com.ubuntu.Upstart"
 	   send_interface="com.ubuntu.Upstart0_6.Instance" />
   </policy>
-
-  <!-- Allow any user to introspect Upstart's interfaces, to obtain the
-       values of properties (but not set them) and to invoke selected
-       methods on Upstart and its jobs that are used to walk information. -->
-  <policy context="default">
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="org.freedesktop.DBus.Introspectable" />
-
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="org.freedesktop.DBus.Properties"
-	   send_type="method_call" send_member="Get" />
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="org.freedesktop.DBus.Properties"
-	   send_type="method_call" send_member="GetAll" />
-
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6"
-	   send_type="method_call" send_member="GetJobByName" />
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6"
-	   send_type="method_call" send_member="GetAllJobs" />
-
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6.Job"
-	   send_type="method_call" send_member="GetInstance" />
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6.Job"
-	   send_type="method_call" send_member="GetInstanceByName" />
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6.Job"
-	   send_type="method_call" send_member="GetAllInstances" />
-  </policy>
 </busconfig>

=== modified file 'dbus/com.ubuntu.Upstart.xml'
--- dbus/com.ubuntu.Upstart.xml	2009-07-03 16:08:10 +0000
+++ dbus/com.ubuntu.Upstart.xml	2011-04-27 14:11:41 +0000
@@ -49,6 +49,13 @@
       <arg name="env" type="as" direction="in" />
       <arg name="wait" type="b" direction="in" />
     </method>
+    <method name="EmitEventWithFile">
+      <annotation name="com.netsplit.Nih.Method.Async" value="true" />
+      <arg name="name" type="s" direction="in" />
+      <arg name="env" type="as" direction="in" />
+      <arg name="wait" type="b" direction="in" />
+      <arg name="file" type="h" direction="in" />
+    </method>
 
     <!-- Basic information about Upstart -->
     <property name="version" type="s" access="read" />

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

=== added directory 'extra'
=== added file 'extra/Makefile.am'
--- extra/Makefile.am	1970-01-01 00:00:00 +0000
+++ extra/Makefile.am	2011-04-27 14:11:41 +0000
@@ -0,0 +1,126 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CFLAGS = \
+	$(NIH_CFLAGS) \
+	$(NIH_DBUS_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(UDEV_CFLAGS)
+
+AM_CPPFLAGS = \
+	-DLOCALEDIR="\"$(localedir)\"" \
+	-DSBINDIR="\"$(sbindir)\"" \
+	-I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
+	-I$(top_srcdir)/intl
+
+
+initdir = $(sysconfdir)/init
+
+
+sbin_PROGRAMS = \
+	upstart-socket-bridge
+
+dist_init_DATA = \
+	conf/upstart-socket-bridge.conf
+
+dist_man_MANS = \
+	man/upstart-socket-bridge.8 \
+	man/socket-event.7
+
+upstart_socket_bridge_SOURCES = \
+	upstart-socket-bridge.c
+nodist_upstart_socket_bridge_SOURCES = \
+	$(com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Upstart_Job_OUTPUTS)
+upstart_socket_bridge_LDADD = \
+	$(LTLIBINTL) \
+	$(NIH_LIBS) \
+	$(NIH_DBUS_LIBS) \
+	$(DBUS_LIBS)
+
+
+if HAVE_UDEV
+dist_init_DATA += \
+	conf/upstart-udev-bridge.conf
+
+dist_man_MANS += \
+	man/upstart-udev-bridge.8
+
+sbin_PROGRAMS += \
+	upstart-udev-bridge
+
+upstart_udev_bridge_SOURCES = \
+	upstart-udev-bridge.c
+nodist_upstart_udev_bridge_SOURCES = \
+	$(com_ubuntu_Upstart_OUTPUTS)
+upstart_udev_bridge_LDADD = \
+	$(LTLIBINTL) \
+	$(NIH_LIBS) \
+	$(NIH_DBUS_LIBS) \
+	$(DBUS_LIBS) \
+	$(UDEV_LIBS)
+
+install-data-hook:
+	src=`echo upstart-udev-bridge| sed '$(transform)'`.8; \
+	for symlink in \
+		net-device-added \
+		net-device-removed \
+		graphics-device-added \
+		drm-device-added; do \
+	  inst=`echo $$symlink | sed '$(transform)'`.7; \
+          echo " ln -sf '$(man8dir)/$$src' '$(DESTDIR)$(man7dir)/$$inst'"; \
+	  ln -sf "$(man8dir)/$$src" "$(DESTDIR)$(man7dir)/$$inst"; \
+	done
+
+else
+EXTRA_DIST = \
+	man/upstart-udev-bridge.8
+
+endif
+
+
+com_ubuntu_Upstart_OUTPUTS = \
+	com.ubuntu.Upstart.c \
+	com.ubuntu.Upstart.h
+
+com_ubuntu_Upstart_XML = \
+	../dbus/com.ubuntu.Upstart.xml
+
+$(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML)
+	$(AM_V_GEN)$(NIH_DBUS_TOOL) \
+		--package=$(PACKAGE) \
+		--mode=proxy --prefix=upstart \
+		--default-interface=com.ubuntu.Upstart0_6 \
+		--output=$@ $<
+
+
+com_ubuntu_Upstart_Job_OUTPUTS = \
+	com.ubuntu.Upstart.Job.c \
+	com.ubuntu.Upstart.Job.h
+
+com_ubuntu_Upstart_Job_XML = \
+	../dbus/com.ubuntu.Upstart.Job.xml
+
+$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML)
+	$(AM_V_GEN)$(NIH_DBUS_TOOL) \
+		--package=$(PACKAGE) \
+		--mode=proxy --prefix=job_class \
+		--default-interface=com.ubuntu.Upstart0_6.Job \
+		--output=$@ $<
+
+
+# These have to be built sources because we can't compile object files
+# without the header file existing first
+BUILT_SOURCES = \
+	$(com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Upstart_Job_OUTPUTS)
+
+CLEANFILES = \
+	$(com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Upstart_Job_OUTPUTS)
+
+
+clean-local:
+	rm -f *.gcno *.gcda
+
+maintainer-clean-local:
+	rm -f *.gcov

=== added directory 'extra/conf'
=== added file 'extra/conf/upstart-socket-bridge.conf'
--- extra/conf/upstart-socket-bridge.conf	1970-01-01 00:00:00 +0000
+++ extra/conf/upstart-socket-bridge.conf	2011-04-27 14:11:41 +0000
@@ -0,0 +1,16 @@
+# upstart-socket-bridge - Bridge socket events into upstart
+#
+# This helper daemon receives socket(7) events and
+# emits equivalent Upstart events.
+
+description	"Bridge socket events into upstart"
+
+emits socket
+
+start on net-device-up IFACE=lo
+stop on runlevel [!2345]
+
+expect daemon
+respawn
+
+exec upstart-socket-bridge --daemon

=== added file 'extra/conf/upstart-udev-bridge.conf'
--- extra/conf/upstart-udev-bridge.conf	1970-01-01 00:00:00 +0000
+++ extra/conf/upstart-udev-bridge.conf	2011-04-27 14:11:41 +0000
@@ -0,0 +1,16 @@
+# upstart-udev-bridge - Bridge udev events into upstart
+#
+# This helper daemon receives udev events from the netlink socket and
+# emits equivalent Upstart events.
+
+description	"Bridge udev events into upstart"
+
+emits *-device-*
+
+start on starting udev
+stop on stopped udev
+
+expect daemon
+respawn
+
+exec upstart-udev-bridge --daemon

=== added directory 'extra/man'
=== added file 'extra/man/socket-event.7'
--- extra/man/socket-event.7	1970-01-01 00:00:00 +0000
+++ extra/man/socket-event.7	2011-04-27 14:11:41 +0000
@@ -0,0 +1,92 @@
+.TH socket\-event 8 2011-03-08 upstart
+.\"
+.SH NAME
+socket \- event signalling that a socket connection has been made
+.\"
+.SH SYNOPSIS
+.B socket
+.BI PROTO\fR= PROTO
+.BI PORT\fR= PORT
+.BI ADDR\fR= ADDR
+
+.B socket
+.BI PROTO\fR= PROTO
+.BI PATH\fR= PATH
+.\"
+.SH DESCRIPTION
+
+The
+.B socket
+event is generated by the
+.BR upstart\-socket\-bridge (8)
+daemon when a socket connection is made whose details match the
+socket event condition and environment specified in a jobs
+.B start on
+or
+.B stop on
+stanza.
+
+When an incoming connection is detected, the file descriptor
+representing the socket is passed to the job in question to allow it to
+.BR accept (2)
+the connection. Additionally, the environment variable
+.B UPSTART_JOB
+will contain the name of the event ("socket") and the environment
+variable
+.B UPSTART_FDS
+will contain the number of the file descriptor corresponding to the
+listening socket.
+.\"
+.SH EXAMPLES
+.\"
+.SS Internet socket
+Start web server when first client connects from localhost:
+.RS
+.nf
+
+start on socket PROTO=inet PORT=80 ADDR=127.0.0.1
+.fi
+.RE
+.\"
+.SS Local socket
+.P
+.RS
+.nf
+
+start on socket PROTO=unix PATH=/var/run/.s.pgsql.1234
+.fi
+.FE
+.\"
+.SS Abstract socket
+.P
+
+.RS
+.nf
+
+start on socket PROTO=unix PATH=@/at/upstart/example
+.fi
+.FE
+.\"
+.SH AUTHOR
+Written by Scott James Remnant
+.RB < [e-mail] >
+
+Manual page written by James Hunt
+.RB < [e-mail] >
+.\"
+.SH BUGS
+Report bugs at 
+.RB < https://launchpad.net/upstart/+bugs >
+.\"
+.SH COPYRIGHT
+Copyright \(co 2011 Canonical Ltd.
+.PP
+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 (5)
+.BR init (8)
+.BR socket (2)
+.BR socket (7)
+.BR upstart\-socket\-bridge (8)

=== added file 'extra/man/upstart-socket-bridge.8'
--- extra/man/upstart-socket-bridge.8	1970-01-01 00:00:00 +0000
+++ extra/man/upstart-socket-bridge.8	2011-04-27 14:11:41 +0000
@@ -0,0 +1,47 @@
+.TH upstart-socket-bridge 8 2011-03-08 upstart
+.\"
+.SH NAME
+upstart-socket-bridge \- Bridge between Upstart and sockets
+.\"
+.SH SYNOPSIS
+.B upstart-socket-bridge
+.RI [ OPTIONS ]...
+.\"
+.SH DESCRIPTION
+The
+.B upstart-socket-bridge
+queries the Upstart 
+.BR init (8)
+daemon for all job configurations which
+.B start on
+or
+.B stop on
+the socket event. It then waits for an incoming connection on each
+specified
+.BR socket (7)
+and when detected emits the socket event (\fBsocket\-event\fP (7)),
+setting a number of environment variables for the job to query.
+.\"
+.SH AUTHOR
+Written by Scott James Remnant
+.RB < [e-mail] >
+
+Manual page written by James Hunt
+.RB < [e-mail] >
+.\"
+.SH BUGS
+Report bugs at 
+.RB < https://launchpad.net/upstart/+bugs >
+.\"
+.SH COPYRIGHT
+Copyright \(co 2011 Canonical Ltd.
+.PP
+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 (5)
+.BR init (8)
+.BR socket (2)
+.BR socket (7)
+.BR socket\-event (7)

=== added file 'extra/man/upstart-udev-bridge.8'
--- extra/man/upstart-udev-bridge.8	1970-01-01 00:00:00 +0000
+++ extra/man/upstart-udev-bridge.8	2011-04-27 14:11:41 +0000
@@ -0,0 +1,57 @@
+.TH upstart\-udev\-bridge 8 2011-03-08 upstart
+.\"
+.SH NAME
+upstart\-udev\-bridge \- Bridge between Upstart and udev
+.\"
+.SH SYNOPSIS
+.B upstart\-udev\-bridge
+.RI [ OPTIONS ]...
+.\"
+.SH DESCRIPTION
+.B upstart\-udev\-bridge
+receives information about kernel uevents that
+.BR udev (8)
+has completed and creates
+.BR init (8)
+events for them.
+
+It emits events which match the pattern "\fIS\fP\-device\-\fIA\fP" where
+\(aqS\(aq is the udev \fIsubsystem\fP and \(aqA\(aq is the udev \fIaction\fP.
+See \fBudev\fP(7) and for further details.
+
+Assuming \fI/sys\fP is mounted, possible values for \fIsubsystem\fP for
+your system are viewable via \fI/sys/class/\fP.
+
+.\"
+.SH EXAMPLES
+
+.IP net\-device\-added
+Event emitted when a network device is added.
+.IP net\-device\-removed
+Event emitted when a network device is removed.
+.IP graphics\-card\-added
+Event emitted when a graphics device is available to the system.
+.\"
+.SH NOTES
+This is a temporary tool until
+.BR init (8)
+itself gains the functionality to read them directly; you should not
+rely on its behaviour.
+.\"
+.SH AUTHOR
+Written by Scott James Remnant
+.RB < [e-mail] >
+.\"
+.SH BUGS
+Report bugs at 
+.RB < https://launchpad.net/ubuntu/+source/upstart/+bugs >
+.\"
+.SH COPYRIGHT
+Copyright \(co 2009,2010,2011 Canonical Ltd.
+.PP
+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 (5)
+.BR init (8)
+.BR udev (7)

=== added file 'extra/upstart-socket-bridge.c'
--- extra/upstart-socket-bridge.c	1970-01-01 00:00:00 +0000
+++ extra/upstart-socket-bridge.c	2011-04-27 14:11:41 +0000
@@ -0,0 +1,644 @@
+/* upstart
+ *
+ * Copyright © 2010 Canonical Ltd.
+ * Author: Scott James Remnant <[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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+
+#include <sys/epoll.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
+#include <nih/macros.h>
+#include <nih/alloc.h>
+#include <nih/list.h>
+#include <nih/hash.h>
+#include <nih/string.h>
+#include <nih/io.h>
+#include <nih/option.h>
+#include <nih/main.h>
+#include <nih/logging.h>
+#include <nih/error.h>
+
+#include <nih-dbus/dbus_connection.h>
+#include <nih-dbus/dbus_proxy.h>
+
+#include "dbus/upstart.h"
+#include "com.ubuntu.Upstart.h"
+#include "com.ubuntu.Upstart.Job.h"
+
+
+/* Structure we use for tracking jobs */
+typedef struct job {
+	NihList entry;
+	char *path;
+	NihList sockets;
+} Job;
+
+/* Structure we use for tracking listening sockets */
+typedef struct socket {
+	NihList entry;
+
+	union {
+		struct sockaddr        addr;
+		struct sockaddr_in sin_addr;
+		struct sockaddr_un sun_addr;
+	};
+	socklen_t addrlen;
+
+	int sock;
+} Socket;
+
+
+/* Prototypes for static functions */
+static void epoll_watcher        (void *data, NihIoWatch *watch,
+				  NihIoEvents events);
+static void upstart_job_added    (void *data, NihDBusMessage *message,
+				  const char *job);
+static void upstart_job_removed  (void *data, NihDBusMessage *message,
+				  const char *job);
+static void job_add_socket       (Job *job, char **socket_info);
+static void socket_destroy       (Socket *socket);
+static void upstart_disconnected (DBusConnection *connection);
+static void emit_event_reply     (Socket *sock, NihDBusMessage *message);
+static void emit_event_error     (Socket *sock, NihDBusMessage *message);
+
+
+/**
+ * daemonise:
+ *
+ * Set to TRUE if we should become a daemon, rather than just running
+ * in the foreground.
+ **/
+static int daemonise = FALSE;
+
+/**
+ * epoll_fd:
+ *
+ * Shared epoll file descriptor for listening on.
+ **/
+static int epoll_fd = -1;
+
+/**
+ * jobs:
+ *
+ * Jobs that we're monitoring.
+ **/
+static NihHash *jobs = NULL;
+
+/**
+ * upstart:
+ *
+ * Proxy to Upstart daemon.
+ **/
+static NihDBusProxy *upstart = NULL;
+
+
+/**
+ * options:
+ *
+ * Command-line options accepted by this program.
+ **/
+static NihOption options[] = {
+	{ 0, "daemon", N_("Detach and run in the background"),
+	  NULL, NULL, &daemonise, NULL },
+
+	NIH_OPTION_LAST
+};
+
+
+int
+main (int   argc,
+      char *argv[])
+{
+	char **         args;
+	DBusConnection *connection;
+	char **         job_class_paths;
+	int             ret;
+
+	nih_main_init (argv[0]);
+
+	nih_option_set_synopsis (_("Bridge socket events into upstart"));
+	nih_option_set_help (
+		_("By default, upstart-socket-bridge does not detach from the "
+		  "console and remains in the foreground.  Use the --daemon "
+		  "option to have it detach."));
+
+	args = nih_option_parser (NULL, argc, argv, options, FALSE);
+	if (! args)
+		exit (1);
+
+	/* Create an epoll file descriptor for listening on; use this so
+	 * we can do edge triggering rather than level.
+	 */
+	epoll_fd = epoll_create1 (0);
+	if (epoll_fd < 0) {
+		nih_fatal ("%s: %s", _("Could not create epoll descriptor"),
+			   strerror (errno));
+		exit (1);
+	}
+
+	NIH_MUST (nih_io_add_watch (NULL, epoll_fd, NIH_IO_READ,
+				    epoll_watcher, NULL));
+
+	/* Allocate jobs hash table */
+	jobs = NIH_MUST (nih_hash_string_new (NULL, 0));
+
+	/* Initialise the connection to Upstart */
+	connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, upstart_disconnected));
+	if (! connection) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_fatal ("%s: %s", _("Could not connect to Upstart"),
+			   err->message);
+		nih_free (err);
+
+		exit (1);
+	}
+
+	upstart = NIH_SHOULD (nih_dbus_proxy_new (NULL, connection,
+						  NULL, DBUS_PATH_UPSTART,
+						  NULL, NULL));
+	if (! upstart) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_fatal ("%s: %s", _("Could not create Upstart proxy"),
+			   err->message);
+		nih_free (err);
+
+		exit (1);
+	}
+
+	/* Connect signals to be notified when jobs come and go */
+	if (! nih_dbus_proxy_connect (upstart, &upstart_com_ubuntu_Upstart0_6, "JobAdded",
+				      (NihDBusSignalHandler)upstart_job_added, NULL)) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_fatal ("%s: %s", _("Could not create JobAdded signal connection"),
+			   err->message);
+		nih_free (err);
+
+		exit (1);
+	}
+
+	if (! nih_dbus_proxy_connect (upstart, &upstart_com_ubuntu_Upstart0_6, "JobRemoved",
+				      (NihDBusSignalHandler)upstart_job_removed, NULL)) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_fatal ("%s: %s", _("Could not create JobRemoved signal connection"),
+			   err->message);
+		nih_free (err);
+
+		exit (1);
+	}
+
+	/* Request a list of all current jobs */
+	if (upstart_get_all_jobs_sync (NULL, upstart, &job_class_paths) < 0) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_fatal ("%s: %s", _("Could not obtain job list"),
+			   err->message);
+		nih_free (err);
+
+		exit (1);
+	}
+
+	for (char **job_class_path = job_class_paths;
+	     job_class_path && *job_class_path; job_class_path++)
+		upstart_job_added (NULL, NULL, *job_class_path);
+
+	nih_free (job_class_paths);
+
+	/* Become daemon */
+	if (daemonise) {
+		if (nih_main_daemonise () < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_fatal ("%s: %s", _("Unable to become daemon"),
+				   err->message);
+			nih_free (err);
+
+			exit (1);
+		}
+
+		/* Send all logging output to syslog */
+		openlog (program_name, LOG_PID, LOG_DAEMON);
+		nih_log_set_logger (nih_logger_syslog);
+	}
+
+	/* Handle TERM and INT signals gracefully */
+	nih_signal_set_handler (SIGTERM, nih_signal_handler);
+	NIH_MUST (nih_signal_add_handler (NULL, SIGTERM, nih_main_term_signal, NULL));
+
+	if (! daemonise) {
+		nih_signal_set_handler (SIGINT, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGINT, nih_main_term_signal, NULL));
+	}
+
+	ret = nih_main_loop ();
+
+	return ret;
+}
+
+
+static void
+epoll_watcher (void *      data,
+	       NihIoWatch *watch,
+	       NihIoEvents events)
+{
+	struct epoll_event event[1024];
+	int                num_events;
+
+	num_events = epoll_wait (epoll_fd, event, 1024, 0);
+	if (num_events < 0) {
+		nih_error ("%s: %s", _("Error from epoll"), strerror (errno));
+		return;
+	} else if (num_events == 0)
+		return;
+
+	for (int i = 0; i < num_events; i++) {
+		Socket *sock = (Socket *)event[i].data.ptr;
+		nih_local char **env = NULL;
+		size_t env_len = 0;
+		char *var;
+		DBusPendingCall *pending_call;
+
+		if (event[i].events & EPOLLIN)
+			nih_debug ("%p EPOLLIN", sock);
+		if (event[i].events & EPOLLERR)
+			nih_debug ("%p EPOLLERR", sock);
+		if (event[i].events & EPOLLHUP)
+			nih_debug ("%p EPOLLHUP", sock);
+
+		env = NIH_MUST (nih_str_array_new (NULL));
+
+		switch (sock->addr.sa_family) {
+		case AF_INET:
+			NIH_MUST (nih_str_array_add (&env, NULL, &env_len,
+						     "PROTO=inet"));
+
+			var = NIH_MUST (nih_sprintf (NULL, "PORT=%d",
+						     ntohs (sock->sin_addr.sin_port)));
+			NIH_MUST (nih_str_array_addp (&env, NULL, &env_len,
+						      var));
+			nih_discard (var);
+
+			var = NIH_MUST (nih_sprintf (NULL, "ADDR=%s",
+						     inet_ntoa (sock->sin_addr.sin_addr)));
+			NIH_MUST (nih_str_array_addp (&env, NULL, &env_len,
+						      var));
+			nih_discard (var);
+			break;
+		case AF_UNIX:
+			NIH_MUST (nih_str_array_add (&env, NULL, &env_len,
+						     "PROTO=unix"));
+
+			var = NIH_MUST (nih_sprintf (NULL, "PATH=%s",
+						     sock->sun_addr.sun_path));
+			NIH_MUST (nih_str_array_addp (&env, NULL, &env_len,
+						      var));
+			nih_discard (var);
+			break;
+		default:
+			nih_assert_not_reached ();
+		}
+
+		pending_call = NIH_SHOULD (upstart_emit_event_with_file (
+						   upstart, "socket", env, TRUE,
+						   sock->sock,
+						   (UpstartEmitEventWithFileReply)emit_event_reply,
+						   (NihDBusErrorHandler)emit_event_error,
+						   sock,
+						   NIH_DBUS_TIMEOUT_NEVER));
+		if (! pending_call) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_warn ("%s: %s", _("Could not send socket event"),
+				  err->message);
+			nih_free (err);
+		}
+
+		dbus_pending_call_unref (pending_call);
+
+		// might be EPOLLIN
+		// might be EPOLLERR
+		// might be EPOLLHUP
+	}
+}
+
+
+static void
+upstart_job_added (void *          data,
+		   NihDBusMessage *message,
+		   const char *    job_class_path)
+{
+	nih_local NihDBusProxy *job_class = NULL;
+	nih_local char ***start_on = NULL;
+	nih_local char ***stop_on = NULL;
+	Job *job;
+
+	nih_assert (job_class_path != NULL);
+
+	/* Obtain a proxy to the job */
+	job_class = nih_dbus_proxy_new (NULL, upstart->connection,
+					upstart->name, job_class_path,
+					NULL, NULL);
+	if (! job_class) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_error ("Could not create proxy for job %s: %s",
+			   job_class_path, err->message);
+		nih_free (err);
+
+		return;
+	}
+
+	job_class->auto_start = FALSE;
+
+	/* Obtain the start_on and stop_on properties of the job */
+	if (job_class_get_start_on_sync (NULL, job_class, &start_on) < 0) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_error ("Could not obtain job start condition %s: %s",
+			   job_class_path, err->message);
+		nih_free (err);
+
+		return;
+	}
+
+	if (job_class_get_stop_on_sync (NULL, job_class, &stop_on) < 0) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_error ("Could not obtain job stop condition %s: %s",
+			   job_class_path, err->message);
+		nih_free (err);
+
+		return;
+	}
+
+	/* Free any existing record for the job (should never happen,
+	 * but worth being safe).
+	 */
+	job = (Job *)nih_hash_lookup (jobs, job_class_path);
+	if (job)
+		nih_free (job);
+
+	/* Create new record for the job */
+	job = NIH_MUST (nih_new (NULL, Job));
+	job->path = NIH_MUST (nih_strdup (job, job_class_path));
+
+	nih_list_init (&job->entry);
+	nih_list_init (&job->sockets);
+
+	/* Find out whether this job listens for any socket events */
+	for (char ***event = start_on; event && *event && **event; event++)
+		if (! strcmp (**event, "socket"))
+			job_add_socket (job, *event);
+	for (char ***event = stop_on; event && *event && **event; event++)
+		if (! strcmp (**event, "socket"))
+			job_add_socket (job, *event);
+
+	/* If we didn't end up with any sockets, free the job and move on */
+	if (NIH_LIST_EMPTY (&job->sockets)) {
+		nih_free (job);
+		return;
+	}
+
+	nih_debug ("Job got added %s", job_class_path);
+
+	nih_alloc_set_destructor (job, nih_list_destroy);
+	nih_hash_add (jobs, &job->entry);
+}
+
+static void
+upstart_job_removed (void *          data,
+		     NihDBusMessage *message,
+		     const char *    job_path)
+{
+	Job *job;
+
+	nih_assert (job_path != NULL);
+
+	job = (Job *)nih_hash_lookup (jobs, job_path);
+	if (job) {
+		nih_debug ("Job went away %s", job_path);
+		nih_free (job);
+	}
+}
+
+
+static void
+job_add_socket (Job *  job,
+		char **socket_info)
+{
+	Socket *sock;
+	nih_local char *error = NULL;
+	int     components = 0;
+	struct epoll_event event;
+
+	nih_assert (job != NULL);
+	nih_assert (socket_info != NULL);
+	nih_assert (! strcmp(socket_info[0], "socket"));
+
+	sock = NIH_MUST (nih_new (job, Socket));
+	memset (sock, 0, sizeof sock);
+	sock->sock = -1;
+
+	nih_list_init (&sock->entry);
+
+	nih_debug ("Found socket");
+	for (char **env = socket_info + 1; env && *env; env++) {
+		char  *val;
+		size_t name_len;
+
+		val = strchr (*env, '=');
+		if (! val) {
+			nih_warn ("Ignored socket event without variable name in %s",
+				  job->path);
+			goto error;
+		}
+
+		name_len = val - *env;
+		val++;
+
+		if (! strncmp (*env, "PROTO", name_len)) {
+			if (! strcmp (val, "inet")) {
+				sock->addrlen = sizeof sock->sin_addr;
+				sock->sin_addr.sin_family = AF_INET;
+				sock->sin_addr.sin_addr.s_addr = INADDR_ANY;
+				components = 1;
+			} else if (! strcmp (val, "unix")) {
+				sock->addrlen = sizeof sock->sun_addr;
+				sock->sun_addr.sun_family = AF_UNIX;
+				components = 1;
+			} else {
+				nih_warn ("Ignored socket event with unknown PROTO=%s in %s",
+					  val, job->path);
+				goto error;
+			}
+
+		} else if (! strncmp (*env, "PORT", name_len)
+			   && (sock->sin_addr.sin_family == AF_INET)) {
+			sock->sin_addr.sin_port = htons (atoi (val));
+			components--;
+
+		} else if (! strncmp (*env, "ADDR", name_len)
+			   && (sock->sin_addr.sin_family == AF_INET)) {
+			if (inet_aton (val, &(sock->sin_addr.sin_addr)) == 0) {
+				nih_warn ("Ignored socket event with invalid ADDR=%s in %s",
+					  val, job->path);
+				goto error;
+			}
+
+		} else if (! strncmp (*env, "PATH", name_len)
+			   && (sock->sun_addr.sun_family == AF_UNIX)) {
+			strncpy (sock->sun_addr.sun_path, val,
+				 sizeof sock->sun_addr.sun_path);
+
+			if (sock->sun_addr.sun_path[0] == '@')
+				sock->sun_addr.sun_path[0] = '\0';
+
+			components--;
+
+		} else {
+			nih_warn ("Ignored socket event with unknown variable %.*s in %s",
+				  (int)name_len, *env, job->path);
+			goto error;
+		}
+	}
+
+	/* Missing any required components? */
+	if (components) {
+		nih_warn ("Ignored incomplete socket event in %s",
+			  job->path);
+		goto error;
+	}
+
+	/* Let's try and set this baby up */
+	sock->sock = socket (sock->addr.sa_family, SOCK_STREAM, 0);
+	if (sock->sock < 0) {
+		nih_warn ("Failed to create socket in %s: %s",
+			  job->path, strerror (errno));
+		goto error;
+	}
+
+	int opt = 1;
+	if (setsockopt (sock->sock, SOL_SOCKET, SO_REUSEADDR,
+			&opt, sizeof opt) < 0) {
+		nih_warn ("Failed to set socket reuse in %s: %s",
+			  job->path, strerror (errno));
+		goto error;
+	}
+
+	if (bind (sock->sock, &sock->addr, sock->addrlen) < 0) {
+		nih_warn ("Failed to bind socket in %s: %s",
+			  job->path, strerror (errno));
+		goto error;
+	}
+
+	if (listen (sock->sock, SOMAXCONN) < 0) {
+		nih_warn ("Failed to listen on socket in %s: %s",
+			  job->path, strerror (errno));
+		goto error;
+	}
+
+	/* We have a listening socket, now we want to be notified when someone
+	 * connects; but we just want one notification, we don't want to get
+	 * a DDoS of wake-ups while waiting for the service to start.
+	 *
+	 * The solution is to use epoll in edge-triggered mode, this will
+	 * fire only on initial connection until a new one comes in.
+	 */
+	event.events = EPOLLIN | EPOLLET;
+	event.data.ptr = sock;
+
+	if (epoll_ctl (epoll_fd, EPOLL_CTL_ADD, sock->sock, &event) < 0) {
+		nih_warn ("Failed to watch socket in %s: %s",
+			  job->path, strerror (errno));
+		goto error;
+	}
+
+	/* Okay then, add to the job */
+	nih_alloc_set_destructor (sock, socket_destroy);
+	nih_list_add (&job->sockets, &sock->entry);
+
+	return;
+
+error:
+	if (sock->sock != -1)
+		close (sock->sock);
+	nih_free (sock);
+}
+
+static void
+socket_destroy (Socket *sock)
+{
+	epoll_ctl (epoll_fd, EPOLL_CTL_DEL, sock->sock, NULL);
+	close (sock->sock);
+
+	nih_list_destroy (&sock->entry);
+}
+
+
+static void
+upstart_disconnected (DBusConnection *connection)
+{
+	nih_fatal (_("Disconnected from Upstart"));
+	nih_main_loop_exit (1);
+}
+
+
+static void
+emit_event_reply (Socket *        sock,
+		  NihDBusMessage *message)
+{
+	nih_debug ("Event completed");
+}
+
+static void
+emit_event_error (Socket *        sock,
+		  NihDBusMessage *message)
+{
+	NihError *err;
+
+	err = nih_error_get ();
+	nih_warn ("%s: %s", _("Error emitting socket event"), err->message);
+	nih_free (err);
+}

=== added file 'extra/upstart-udev-bridge.c'
--- extra/upstart-udev-bridge.c	1970-01-01 00:00:00 +0000
+++ extra/upstart-udev-bridge.c	2011-04-27 14:11:41 +0000
@@ -0,0 +1,310 @@
+/* upstart
+ *
+ * Copyright © 2009 Canonical Ltd.
+ * Author: Scott James Remnant <[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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+
+#include <libudev.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+
+#include <nih/macros.h>
+#include <nih/alloc.h>
+#include <nih/string.h>
+#include <nih/io.h>
+#include <nih/option.h>
+#include <nih/main.h>
+#include <nih/logging.h>
+#include <nih/error.h>
+
+#include <nih-dbus/dbus_connection.h>
+#include <nih-dbus/dbus_proxy.h>
+
+#include "dbus/upstart.h"
+#include "com.ubuntu.Upstart.h"
+
+
+/* Prototypes for static functions */
+static void udev_monitor_watcher (struct udev_monitor *udev_monitor,
+				  NihIoWatch *watch, NihIoEvents events);
+static void upstart_disconnected (DBusConnection *connection);
+static void emit_event_error     (void *data, NihDBusMessage *message);
+
+
+/**
+ * daemonise:
+ *
+ * Set to TRUE if we should become a daemon, rather than just running
+ * in the foreground.
+ **/
+static int daemonise = FALSE;
+
+/**
+ * upstart:
+ *
+ * Proxy to Upstart daemon.
+ **/
+static NihDBusProxy *upstart = NULL;
+
+
+/**
+ * options:
+ *
+ * Command-line options accepted by this program.
+ **/
+static NihOption options[] = {
+	{ 0, "daemon", N_("Detach and run in the background"),
+	  NULL, NULL, &daemonise, NULL },
+
+	NIH_OPTION_LAST
+};
+
+
+int
+main (int   argc,
+      char *argv[])
+{
+	char **              args;
+	DBusConnection *     connection;
+	struct udev *        udev;
+	struct udev_monitor *udev_monitor;
+	int                  ret;
+
+	nih_main_init (argv[0]);
+
+	nih_option_set_synopsis (_("Bridge udev events into upstart"));
+	nih_option_set_help (
+		_("By default, upstart-udev-bridge does not detach from the "
+		  "console and remains in the foreground.  Use the --daemon "
+		  "option to have it detach."));
+
+	args = nih_option_parser (NULL, argc, argv, options, FALSE);
+	if (! args)
+		exit (1);
+
+	/* Initialise the connection to Upstart */
+	connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, upstart_disconnected));
+	if (! connection) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_fatal ("%s: %s", _("Could not connect to Upstart"),
+			   err->message);
+		nih_free (err);
+
+		exit (1);
+	}
+
+	upstart = NIH_SHOULD (nih_dbus_proxy_new (NULL, connection,
+						  NULL, DBUS_PATH_UPSTART,
+						  NULL, NULL));
+	if (! upstart) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_fatal ("%s: %s", _("Could not create Upstart proxy"),
+			   err->message);
+		nih_free (err);
+
+		exit (1);
+	}
+
+	/* Initialise the connection to udev */
+	nih_assert (udev = udev_new ());
+	nih_assert (udev_monitor = udev_monitor_new_from_netlink (udev, "udev"));
+	nih_assert (udev_monitor_enable_receiving (udev_monitor) == 0);
+	udev_monitor_set_receive_buffer_size(udev_monitor, 128*1024*1024);
+
+	NIH_MUST (nih_io_add_watch (NULL, udev_monitor_get_fd (udev_monitor),
+				    NIH_IO_READ,
+				    (NihIoWatcher)udev_monitor_watcher,
+				    udev_monitor));
+
+	/* Become daemon */
+	if (daemonise) {
+		if (nih_main_daemonise () < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_fatal ("%s: %s", _("Unable to become daemon"),
+				   err->message);
+			nih_free (err);
+
+			exit (1);
+		}
+
+		/* Send all logging output to syslog */
+		openlog (program_name, LOG_PID, LOG_DAEMON);
+		nih_log_set_logger (nih_logger_syslog);
+	}
+
+	/* Handle TERM and INT signals gracefully */
+	nih_signal_set_handler (SIGTERM, nih_signal_handler);
+	NIH_MUST (nih_signal_add_handler (NULL, SIGTERM, nih_main_term_signal, NULL));
+
+	if (! daemonise) {
+		nih_signal_set_handler (SIGINT, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGINT, nih_main_term_signal, NULL));
+	}
+
+	ret = nih_main_loop ();
+
+	return ret;
+}
+
+
+static void
+udev_monitor_watcher (struct udev_monitor *udev_monitor,
+		      NihIoWatch *         watch,
+		      NihIoEvents          events)
+{
+	struct udev_device *    udev_device;
+	const char *            subsystem;
+	const char *            action;
+	const char *            kernel;
+	const char *            devpath;
+	const char *            devname;
+	nih_local char *        name = NULL;
+	nih_local char **       env = NULL;
+	size_t                  env_len = 0;
+	DBusPendingCall *       pending_call;
+
+	udev_device = udev_monitor_receive_device (udev_monitor);
+	if (! udev_device)
+		return;
+
+	subsystem = udev_device_get_subsystem (udev_device);
+	action = udev_device_get_action (udev_device);
+	kernel = udev_device_get_sysname (udev_device);
+	devpath = udev_device_get_devpath (udev_device);
+	devname = udev_device_get_devnode (udev_device);
+
+	if (! strcmp (action, "add")) {
+		name = NIH_MUST (nih_sprintf (NULL, "%s-device-added",
+					      subsystem));
+	} else if (! strcmp (action, "change")) {
+		name = NIH_MUST (nih_sprintf (NULL, "%s-device-changed",
+					      subsystem));
+	} else if (! strcmp (action, "remove")) {
+		name = NIH_MUST (nih_sprintf (NULL, "%s-device-removed",
+					      subsystem));
+	} else {
+		name = NIH_MUST (nih_sprintf (NULL, "%s-device-%s",
+					      subsystem, action));
+	}
+
+	env = NIH_MUST (nih_str_array_new (NULL));
+
+	if (kernel) {
+		nih_local char *var = NULL;
+
+		var = NIH_MUST (nih_sprintf (NULL, "KERNEL=%s", kernel));
+		NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
+	}
+
+	if (devpath) {
+		nih_local char *var = NULL;
+
+		var = NIH_MUST (nih_sprintf (NULL, "DEVPATH=%s", devpath));
+		NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
+	}
+
+	if (devname) {
+		nih_local char *var = NULL;
+
+		var = NIH_MUST (nih_sprintf (NULL, "DEVNAME=%s", devname));
+		NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
+	}
+
+	if (subsystem) {
+		nih_local char *var = NULL;
+
+		var = NIH_MUST (nih_sprintf (NULL, "SUBSYSTEM=%s", subsystem));
+		NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
+	}
+
+	if (action) {
+		nih_local char *var = NULL;
+
+		var = NIH_MUST (nih_sprintf (NULL, "ACTION=%s", action));
+		NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
+	}
+
+	for (struct udev_list_entry *list_entry = udev_device_get_properties_list_entry (udev_device);
+	     list_entry != NULL;
+	     list_entry = udev_list_entry_get_next (list_entry)) {
+		const char *    key;
+		nih_local char *var = NULL;
+
+		key = udev_list_entry_get_name (list_entry);
+		if (! strcmp (key, "DEVPATH"))
+			continue;
+		if (! strcmp (key, "DEVNAME"))
+			continue;
+		if (! strcmp (key, "SUBSYSTEM"))
+			continue;
+		if (! strcmp (key, "ACTION"))
+			continue;
+
+		var = NIH_MUST (nih_sprintf (NULL, "%s=%s", key,
+					     udev_list_entry_get_value (list_entry)));
+		NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
+	}
+
+	nih_debug ("%s %s", name, devname);
+
+	pending_call = NIH_SHOULD (upstart_emit_event (upstart,
+						       name, env, FALSE,
+						       NULL, emit_event_error, NULL,
+						       NIH_DBUS_TIMEOUT_NEVER));
+	if (! pending_call) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_warn ("%s", err->message);
+		nih_free (err);
+	}
+
+	dbus_pending_call_unref (pending_call);
+
+	udev_device_unref (udev_device);
+}
+
+
+static void
+upstart_disconnected (DBusConnection *connection)
+{
+	nih_fatal (_("Disconnected from Upstart"));
+	nih_main_loop_exit (1);
+}
+
+static void
+emit_event_error (void *          data,
+		  NihDBusMessage *message)
+{
+	NihError *err;
+
+	err = nih_error_get ();
+	nih_warn ("%s", err->message);
+	nih_free (err);
+}

=== modified file 'init/Makefile.am'
--- init/Makefile.am	2010-02-04 03:42:29 +0000
+++ init/Makefile.am	2011-04-27 14:11:41 +0000
@@ -40,6 +40,7 @@
 	system.c system.h \
 	environ.c environ.h \
 	process.c process.h \
+	session.c session.h \
 	job_class.c job_class.h \
 	job_process.c job_process.h \
 	job.c job.h \
@@ -144,20 +145,24 @@
 tests: $(BUILT_SOURCES) $(check_PROGRAMS)
 
 test_system_SOURCES = tests/test_system.c
+test_system_CFLAGS = $(AM_CFLAGS) -DTEST
 test_system_LDADD = \
 	system.o \
 	$(NIH_LIBS)
 
 test_environ_SOURCES = tests/test_environ.c
+test_environ_CFLAGS = $(AM_CFLAGS) -DTEST
 test_environ_LDADD = \
 	environ.o \
 	$(NIH_LIBS)
 
 test_process_SOURCES = tests/test_process.c
+test_process_CFLAGS = $(AM_CFLAGS) -DTEST
 test_process_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -165,10 +170,12 @@
 	$(DBUS_LIBS)
 
 test_job_class_SOURCES = tests/test_job_class.c
+test_job_class_CFLAGS = $(AM_CFLAGS) -DTEST
 test_job_class_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -176,10 +183,12 @@
 	$(DBUS_LIBS)
 
 test_job_process_SOURCES = tests/test_job_process.c
+test_job_process_CFLAGS = $(AM_CFLAGS) -DTEST
 test_job_process_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -187,10 +196,12 @@
 	$(DBUS_LIBS)
 
 test_job_SOURCES = tests/test_job.c
+test_job_CFLAGS = $(AM_CFLAGS) -DTEST
 test_job_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -198,10 +209,12 @@
 	$(DBUS_LIBS)
 
 test_event_SOURCES = tests/test_event.c
+test_event_CFLAGS = $(AM_CFLAGS) -DTEST
 test_event_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -209,10 +222,12 @@
 	$(DBUS_LIBS)
 
 test_event_operator_SOURCES = tests/test_event_operator.c
+test_event_operator_CFLAGS = $(AM_CFLAGS) -DTEST
 test_event_operator_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -220,10 +235,12 @@
 	$(DBUS_LIBS)
 
 test_blocked_SOURCES = tests/test_blocked.c
+test_blocked_CFLAGS = $(AM_CFLAGS) -DTEST
 test_blocked_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -231,10 +248,12 @@
 	$(DBUS_LIBS)
 
 test_parse_job_SOURCES = tests/test_parse_job.c
+test_parse_job_CFLAGS = $(AM_CFLAGS) -DTEST
 test_parse_job_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -242,10 +261,12 @@
 	$(DBUS_LIBS)
 
 test_parse_conf_SOURCES = tests/test_parse_conf.c
+test_parse_conf_CFLAGS = $(AM_CFLAGS) -DTEST
 test_parse_conf_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -253,10 +274,12 @@
 	$(DBUS_LIBS)
 
 test_conf_SOURCES = tests/test_conf.c
+test_conf_CFLAGS = $(AM_CFLAGS) -DTEST
 test_conf_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
@@ -264,10 +287,12 @@
 	$(DBUS_LIBS)
 
 test_control_SOURCES = tests/test_control.c
+test_control_CFLAGS = $(AM_CFLAGS) -DTEST
 test_control_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \

=== modified file 'init/conf.c'
--- init/conf.c	2011-03-15 18:44:09 +0000
+++ init/conf.c	2011-04-27 14:11:41 +0000
@@ -2,8 +2,12 @@
  *
  * conf.c - configuration management
  *
+<<<<<<< TREE
  * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
+=======
+ * Copyright © 2009, 2010 Canonical Ltd.
+>>>>>>> MERGE-SOURCE
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -49,7 +53,7 @@
 #include "parse_conf.h"
 #include "conf.h"
 #include "errors.h"
-
+#include "paths.h"
 
 /* Prototypes for static functions */
 static int  conf_source_reload_file    (ConfSource *source)
@@ -71,9 +75,19 @@
 					struct stat *statbuf)
 	__attribute__ ((warn_unused_result));
 
-static int  conf_reload_path           (ConfSource *source, const char *path)
-	__attribute__ ((warn_unused_result));
-
+static int  conf_reload_path           (ConfSource *source, const char *path,
+					const char *override_path)
+	__attribute__ ((warn_unused_result));
+
+static inline int  is_conf_file        (const char *path)
+	__attribute__ ((warn_unused_result));
+
+static inline int is_conf_file_std     (const char *path)
+	__attribute__ ((warn_unused_result));
+
+static inline int
+is_conf_file_override                  (const char *path)
+	__attribute__ ((warn_unused_result));
 
 /**
  * conf_sources:
@@ -86,6 +100,115 @@
 
 
 /**
+ * is_conf_file_std:
+ * @path: path to check.
+ *
+ * Determine if specified path contains a legitimate
+ * configuration file name.
+ *
+ * Returns: TRUE if @path contains a valid configuration file name,
+ * else FALSE.
+ *
+ **/
+static inline int
+is_conf_file_std (const char *path)
+{
+	char *ptr = strrchr (path, '.');
+
+	if (ptr && IS_CONF_EXT_STD (ptr))
+		return TRUE;
+
+	return FALSE;
+}
+
+/**
+ * is_conf_file_override:
+ * @path: path to check.
+ *
+ * Determine if specified path contains a legitimate
+ * override file name.
+ *
+ * Returns: TRUE if @path contains a valid override file name,
+ * else FALSE.
+ *
+ **/
+static inline int
+is_conf_file_override (const char *path)
+{
+	char *ptr = strrchr (path, '.');
+
+	if (ptr && IS_CONF_EXT_OVERRIDE (ptr))
+		return TRUE;
+
+	return FALSE;
+}
+
+/**
+ * is_conf_file:
+ * @path: path to check.
+ *
+ * Determine if specified path contains a legitimate
+ * configuration file or override file name.
+ *
+ * Returns: TRUE if @path contains a valid configuration
+ * file or override file name, else FALSE.
+ *
+ **/
+static inline int
+is_conf_file (const char *path)
+{
+	char *ptr = strrchr (path, '.');
+
+	if (ptr && IS_CONF_EXT (ptr))
+		return TRUE;
+
+	return FALSE;
+}
+
+/**
+ * Convert a configuration file name to an override file name and vice
+ * versa.
+ *
+ * For example, if @path is "foo.conf", this function will return
+ * "foo.override", whereas if @path is "foo.override", it will return
+ * "foo.conf".
+ *
+ * Note that this function should be static, but isn't to allow the
+ * tests to access it.
+ *
+ * @parent: parent of returned path,
+ * @path: path to a configuration file.
+ *
+ * Returns: newly allocated toggled path, or NULL on error.
+ **/
+char *
+toggle_conf_name (const void     *parent,
+		 const char     *path)
+{
+	char *new_path;
+	char *ext;
+	char *new_ext;
+	size_t len;
+
+	ext = strrchr (path, '.');
+	if (!ext)
+		return NULL;
+
+	new_ext = IS_CONF_EXT_STD (ext)
+		? CONF_EXT_OVERRIDE
+		: CONF_EXT_STD;
+
+	len = strlen (new_ext);
+
+	new_path = NIH_MUST (nih_strndup (parent, path, (ext - path) + len));
+
+	memcpy (new_path + (ext - path), new_ext, len);
+
+	return new_path;
+}
+
+
+/**
  * conf_init:
  *
  * Initialise the conf_sources list.
@@ -147,6 +270,7 @@
 
 	source->type = type;
 	source->watch = NULL;
+	source->session = NULL;
 
 	source->flag = FALSE;
 	source->files = nih_hash_string_new (source, 0);
@@ -233,10 +357,9 @@
 			NihError *err;
 
 			err = nih_error_get ();
-			if (err->number != ENOENT)
-				nih_error ("%s: %s: %s", source->path,
-					   _("Unable to load configuration"),
-					   err->message);
+			nih_error ("%s: %s: %s", source->path,
+					_("Unable to load configuration"),
+					err->message);
 			nih_free (err);
 		}
 	}
@@ -329,10 +452,16 @@
 conf_source_reload_file (ConfSource *source)
 {
 	NihError *err = NULL;
+	nih_local char *override_path = NULL;
+
+	struct stat statbuf;
 
 	nih_assert (source != NULL);
 	nih_assert (source->type == CONF_FILE);
 
+	/* this function should only be called for standard
+	 * configuration files.
+	 */
 	if (! source->watch) {
 		nih_local char *dpath = NULL;
 		char           *dname;
@@ -361,7 +490,7 @@
 	/* Parse the file itself.  If this fails, then we can discard the
 	 * inotify error, since this one will be better.
 	 */
-	if (conf_reload_path (source, source->path) < 0) {
+	if (conf_reload_path (source, source->path, NULL) < 0) {
 		if (err)
 			nih_free (err);
 
@@ -382,6 +511,23 @@
 		nih_free (err);
 	}
 
+	if (! is_conf_file_std (source->path))
+		return 0;
+
+	override_path = toggle_conf_name (NULL, source->path);
+
+	if (stat (override_path, &statbuf) != 0)
+		return 0;
+
+	nih_debug ("Updating configuration for %s from %s",
+		  source->path, override_path);
+	if (conf_reload_path (source, source->path, override_path) < 0) {
+		if (err)
+			nih_free (err);
+
+		return -1;
+	}
+
 	return 0;
 }
 
@@ -501,19 +647,18 @@
  * @is_dir: TRUE of @path is a directory.
  *
  * This is the file filter used for the jobs directory, we only care
- * about paths with the ".conf" extension.  Directories that
- * match the nih_file_ignore() function are also ignored.
- *
- * Returns: FALSE if @path ends in ".conf", or is the original source,
- * TRUE otherwise.
+ * about paths with particular extensions (see IS_CONF_EXT).
+ *
+ * Directories that match the nih_file_ignore() function are also ignored.
+ *
+ * Returns: FALSE if @path ends in ".conf" or ".override",
+ * or is the original source, TRUE otherwise.
  **/
 static int
 conf_dir_filter (ConfSource *source,
 		 const char *path,
 		 int         is_dir)
 {
-	char *ptr;
-
 	nih_assert (source != NULL);
 	nih_assert (path != NULL);
 
@@ -523,8 +668,12 @@
 	if (is_dir)
 		return nih_file_ignore (NULL, path);
 
+<<<<<<< TREE
 	ptr = strrchr (path, '.');
 	if (ptr && (ptr > path) && (ptr[-1] != '/') && (! strcmp (ptr, ".conf")))
+=======
+	if (is_conf_file (path))
+>>>>>>> MERGE-SOURCE
 		return FALSE;
 
 	return TRUE;
@@ -546,29 +695,92 @@
  * After checking that it was a regular file that was changed, we reload it;
  * we expect this to fail sometimes since the file may be only partially
  * written.
-  **/
+ **/
 static void
 conf_create_modify_handler (ConfSource  *source,
 			    NihWatch    *watch,
 			    const char  *path,
 			    struct stat *statbuf)
 {
+	ConfFile *file = NULL;
+	const char *error_path = path;
+	nih_local char *new_path = NULL;
+	int ret;
+
 	nih_assert (source != NULL);
 	nih_assert (watch != NULL);
 	nih_assert (path != NULL);
 	nih_assert (statbuf != NULL);
 
+	/* note that symbolic links are ignored */
 	if (! S_ISREG (statbuf->st_mode))
 		return;
 
-	if (conf_reload_path (source, path) < 0) {
+	new_path = toggle_conf_name (NULL, path);
+	file = (ConfFile *)nih_hash_lookup (source->files, new_path);
+
+	if (is_conf_file_override (path)) {
+		if (! file) {
+			/* override file has no corresponding conf file */
+			nih_debug ("Ignoring orphan override file %s", path);
+			return;
+		}
+
+		/* reload conf file */
+		nih_debug ("Loading configuration file %s", new_path);
+		ret = conf_reload_path (source, new_path, NULL);
+		if (ret < 0) {
+			error_path = new_path;
+			goto error;
+		}
+
+		/* overlay override settings */
+		nih_debug ("Loading override file %s for %s", path, new_path);
+		ret = conf_reload_path (source, new_path, path);
+		if (ret < 0) {
+			error_path = path;
+			goto error;
+		}
+	} else {
+		nih_debug ("Loading configuration and override files for %s", path);
+
+		/* load conf file */
+		nih_debug ("Loading configuration file %s", path);
+		ret = conf_reload_path (source, path, NULL);
+		if (ret < 0) {
+			error_path = path;
+			goto error;
+		}
+
+		/* ensure we ignore directory changes (which won't have overrides. */
+		if (is_conf_file_std (path)) {
+			struct stat st;
+			if (stat (new_path, &st) == 0) {
+				/* overlay override settings */
+				nih_debug ("Loading override file %s for %s", new_path, path);
+				ret = conf_reload_path (source, path, new_path);
+				if (ret < 0) {
+					error_path = new_path;
+					goto error;
+				}
+			}
+
+		}
+	}
+
+	return;
+
+error:
+	{
 		NihError *err;
 
 		err = nih_error_get ();
-		nih_error ("%s: %s: %s", path,
-			   _("Error while loading configuration file"),
-			   err->message);
+		nih_error ("%s: %s: %s", error_path,
+				_("Error while loading configuration file"),
+				err->message);
 		nih_free (err);
+		if (file)
+			nih_unref (file, source);
 	}
 }
 
@@ -585,13 +797,14 @@
  *
  * We lookup the file in our hash table, and if we can find it, perform
  * the usual deletion of it.
-  **/
+ **/
 static void
 conf_delete_handler (ConfSource *source,
 		     NihWatch   *watch,
 		     const char *path)
 {
 	ConfFile *file;
+	nih_local char *new_path = NULL;
 
 	nih_assert (source != NULL);
 	nih_assert (watch != NULL);
@@ -603,7 +816,11 @@
 	 * it's probably a directory or something, so just ignore it.
 	 */
 	file = (ConfFile *)nih_hash_lookup (source->files, path);
-	if (! file) {
+	/* Note we have to be careful to consider deletion of directories too.
+	 * This is handled implicitly by the override check which will return
+	 * false if passed a directory in this case.
+	 */
+	if (! file && ! is_conf_file_override (path)) {
 		if (! strcmp (watch->path, path)) {
 			nih_warn ("%s: %s", source->path,
 				  _("Configuration directory deleted"));
@@ -614,7 +831,30 @@
 		return;
 	}
 
-	nih_unref (file, source);
+	/* non-override files (and directories) are the simple case, so handle
+	 * them and leave.
+	 */ 
+	if (! is_conf_file_override (path)) {
+		nih_unref (file, source);
+		return;
+	}
+
+	/* if an override file is deleted for which there is a corresponding
+	 * conf file, reload the conf file to remove any modifications
+	 * introduced by the override file.
+	 */
+	new_path = toggle_conf_name (NULL, path);
+	file = (ConfFile *)nih_hash_lookup (source->files, new_path);
+
+	if (file) {
+		nih_debug ("Reloading configuration for %s on deletion of overide (%s)",
+				new_path, path);
+
+		if ( conf_reload_path (source, new_path, NULL) < 0 ) {
+			nih_warn ("%s: %s", new_path,
+					_("Unable to reload configuration after override deletion"));
+		}
+	}
 }
 
 /**
@@ -637,22 +877,61 @@
 		   const char  *path,
 		   struct stat *statbuf)
 {
+	ConfFile *file = NULL;
+	nih_local char *new_path = NULL;
+
 	nih_assert (source != NULL);
 	nih_assert (dirname != NULL);
 	nih_assert (path != NULL);
 	nih_assert (statbuf != NULL);
 
+	/* We assume that CONF_EXT_STD files are visited before
+	 * CONF_EXT_OVERRIDE files. Happily, this assumption is currently
+	 * valid since CONF_EXT_STD comes before CONF_EXT_OVERRIDE if ordered
+	 * alphabetically.
+	 *
+	 * If this were ever to change (for example if we decided to
+	 * rename the CONF_EXT_OVERRIDE files to end in ".abc", say), the logic
+	 * in this function would be erroneous since it would never be possible when
+	 * visiting an override file (before a conf file) to lookup a conf file
+	 * in the hash, since the conf file would not yet have been seen and thus would
+	 * not exist in the hash (yet).
+	 */
+	nih_assert (CONF_EXT_STD[1] < CONF_EXT_OVERRIDE[1]);
+
 	if (! S_ISREG (statbuf->st_mode))
 		return 0;
 
-	if (conf_reload_path (source, path) < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_error ("%s: %s: %s", path,
-			   _("Error while loading configuration file"),
-			   err->message);
-		nih_free (err);
+	if (is_conf_file_std (path)) {
+		if (conf_reload_path (source, path, NULL) < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_error ("%s: %s: %s", path,
+					_("Error while loading configuration file"),
+					err->message);
+			nih_free (err);
+		}
+		return 0;
+	}
+
+	new_path = toggle_conf_name (NULL, path);
+	file = (ConfFile *)nih_hash_lookup (source->files, new_path);
+
+	if (file) {
+		/* we're visiting an override file with an associated conf file that
+		 * has already been loaded, so just overlay the override file. If
+		 * there is no corresponding conf file, we ignore the override file.
+		 */
+		if (conf_reload_path (source, new_path, path) < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_error ("%s: %s: %s", new_path,
+					_("Error while reloading configuration file"),
+					err->message);
+			nih_free (err);
+		}
 	}
 
 	return 0;
@@ -662,16 +941,20 @@
 /**
  * conf_reload_path:
  * @source: configuration source,
- * @path: path of file to be reloaded.
+ * @path: path of conf file to be reloaded.
+ * @override_path: if not NULL and @path refers to a path associated with @source,
+ * overlay the contents of @path into the existing @source entry for
+ * @path. If FALSE, discard any existing knowledge of @path.
  *
- * This function is used to parse the file at @path in the context of the
- * given configuration @source.  Necessary ConfFile structures are allocated
- * and attached to @source as appropriate.  CONF_FILE sources always have
- * a single ConfFile when the file exists.
+ * This function is used to parse the file at @path (or @override_path) in the
+ * context of the given configuration @source.  Necessary ConfFile structures
+ * are allocated and attached to @source as appropriate.  CONF_FILE sources
+ * always have a single ConfFile when the file exists.
  *
  * If the file has been parsed before, then the existing item is deleted and
  * freed if the file fails to load, or after the new item has been parsed.
- * Items are not reused between reloads.
+ * Items are only reused between reloads if @override_path is
+ * non-NULL.
  *
  * Physical errors are returned, parse errors are not.
  *
@@ -679,36 +962,47 @@
  **/
 static int
 conf_reload_path (ConfSource *source,
-		  const char *path)
+	  const char *path,
+	  const char *override_path)
 {
-	ConfFile       *file;
+	ConfFile       *file = NULL;
 	nih_local char *buf = NULL;
 	const char     *start, *end;
 	nih_local char *name = NULL;
 	size_t          len, pos, lineno;
 	NihError       *err = NULL;
+	const char     *path_to_load;
 
 	nih_assert (source != NULL);
 	nih_assert (path != NULL);
 
-	/* Look up the old file in memory, and then free it.  In cases
-	 * of failure, we discard it anyway, so there's no particular reason
+	path_to_load = (override_path ? override_path : path);
+
+	/* If there is no corresponding override file, look up the old
+	 * conf file in memory, and then free it.  In cases of failure,
+	 * we discard it anyway, so there's no particular reason
 	 * to keep it around anymore.
+	 *
+	 * Note: if @override_path has been specified, do not
+	 * free the file if found, since we want to _update_ the
+	 * existing entry.
 	 */
 	file = (ConfFile *)nih_hash_lookup (source->files, path);
-	if (file)
+	if (! override_path && file)
 		nih_unref (file, source);
 
 	/* Read the file into memory for parsing, if this fails we don't
 	 * bother creating a new ConfFile structure for it and bail out
 	 * now.
 	 */
-	buf = nih_file_read (NULL, path, &len);
+	buf = nih_file_read (NULL, path_to_load, &len);
 	if (! buf)
 		return -1;
 
-	/* Parse the file, storing the item in a new ConfFile structure. */
-	file = NIH_MUST (conf_file_new (source, path));
+	/* Create a new ConfFile structure (if no @override_path specified) */
+	file = (ConfFile *)nih_hash_lookup (source->files, path);
+	if (! file)
+		file = NIH_MUST (conf_file_new (source, path));
 
 	pos = 0;
 	lineno = 1;
@@ -717,7 +1011,14 @@
 	case CONF_FILE:
 	case CONF_DIR:
 		/* Simple file of options; usually no item attached to it. */
-		nih_debug ("Loading configuration from %s", path);
+		if (override_path) {
+			nih_debug ("Updating configuration for %s from %s",
+					path, override_path);
+		} else {
+			nih_debug ("Loading configuration from %s %s",
+					(source->type == CONF_DIR ? "directory" : "file"), path);
+		}
+
 		if (parse_conf (file, buf, len, &pos, &lineno) < 0)
 			err = nih_error_get ();
 
@@ -735,7 +1036,7 @@
 			start++;
 
 		end = strrchr (start, '.');
-		if (end && (! strcmp (end, ".conf"))) {
+		if (end && IS_CONF_EXT (end)) {
 			name = NIH_MUST (nih_strndup (NULL, start, end - start));
 		} else {
 			name = NIH_MUST (nih_strdup (NULL, start));
@@ -744,8 +1045,14 @@
 		/* Create a new job item and parse the buffer to produce
 		 * the job definition.
 		 */
-		nih_debug ("Loading %s from %s", name, path);
-		file->job = parse_job (NULL, name, buf, len, &pos, &lineno);
+		if (override_path) {
+			nih_debug ("Updating %s (%s) with %s",
+					name, path, override_path);
+		} else {
+			nih_debug ("Loading %s from %s", name, path);
+		}
+		file->job = parse_job (NULL, source->session, file->job,
+				       name, buf, len, &pos, &lineno);
 		if (file->job) {
 			job_class_consider (file->job);
 		} else {
@@ -779,7 +1086,7 @@
 		case PARSE_EXPECTED_OPERATOR:
 		case PARSE_EXPECTED_VARIABLE:
 		case PARSE_MISMATCHED_PARENS:
-			nih_error ("%s:%zi: %s", path, lineno, err->message);
+			nih_error ("%s:%zi: %s", path_to_load, lineno, err->message);
 			nih_free (err);
 			err = NULL;
 			break;
@@ -849,7 +1156,8 @@
 
 /**
  * conf_select_job:
- * @name: name of job class to locate.
+ * @name: name of job class to locate,
+ * @session: session class name belongs to.
  *
  * Select the best available class of a job named @name from the registered
  * configuration sources.
@@ -857,7 +1165,7 @@
  * Returns: Best available job class or NULL if none available.
  **/
 JobClass *
-conf_select_job (const char *name)
+conf_select_job (const char *name, const Session *session)
 {
 	nih_assert (name != NULL);
 
@@ -869,6 +1177,9 @@
 		if (source->type != CONF_JOB_DIR)
 			continue;
 
+		if (source->session != session)
+			continue;
+
 		NIH_HASH_FOREACH (source->files, file_iter) {
 			ConfFile *file = (ConfFile *)file_iter;
 
@@ -882,3 +1193,149 @@
 
 	return NULL;
 }
+
+#ifdef DEBUG
+
+size_t
+debug_count_list_entries (const NihList *list)
+{
+	size_t i = 0;
+	NIH_LIST_FOREACH (list, iter) {
+		i++;
+	}
+	return i;
+}
+
+size_t
+debug_count_hash_entries (const NihHash *hash)
+{
+	size_t i = 0;
+	NIH_HASH_FOREACH_SAFE (hash, iter) {
+		i++;
+	}
+	return i;
+}
+
+void
+debug_show_job_class (const JobClass *job)
+{
+	int i;
+	char **env    = (char **)job->env;
+	char **export = (char **)job->export;
+
+	nih_assert (job);
+
+	nih_debug ("JobClass %p: name='%s', path='%s', task=%d, "
+			"respawn=%d, console=%x, deleted=%d, debug=%d",
+			job, job->name, job->path, job->task,
+			job->respawn, job->console, job->deleted, job->debug);
+
+	nih_debug ("\tstart_on=%p, stop_on=%p, emits=%p, process=%p",
+			job->start_on, job->stop_on, job->emits, job->process);
+
+	nih_debug ("\tauthor='%s', description='%s'",
+			job->author, job->description);
+
+	if (env && *env) {
+		nih_debug ("\tenv:");
+		i = 0;
+		while ( *env ) {
+			nih_debug ("\t\tenv[%d]='%s' (len=%u+1)",
+					i, *env, strlen (*env));
+			env++;
+			++i;
+		}
+	} else {
+		nih_debug ("\tenv: none.");
+	}
+
+
+	if (export && *export) {
+		nih_debug ("\texport:");
+		i = 0;
+		while ( *export ) {
+			nih_debug ("\t\tenv[%d]='%s' (len=%u+1)",
+					i, *export, strlen (*export));
+			export++;
+			++i;
+		}
+	}
+	else {
+		nih_debug ("\texport: none");
+	}
+}
+
+void
+debug_show_job_classes (void)
+{
+	nih_debug ("job_classes:");
+
+	NIH_HASH_FOREACH_SAFE (job_classes, iter) {
+		JobClass *job = (JobClass *)iter;
+		debug_show_job_class (job);
+	}
+}
+
+void
+debug_show_event (const Event *event)
+{
+	nih_assert (event);
+
+	nih_debug ("Event %p: name='%s', progress=%x, failed=%d, "
+			"blockers=%d, blocking=%p",
+			event, event->name, event->progress, event->failed,
+			event->blockers, (void *)&event->blocking);
+}
+
+void
+debug_show_conf_file (const ConfFile *file)
+{
+	nih_assert (file);
+
+	nih_debug ("ConfFile %p: path='%s', source=%p, flag=%x, job=%p",
+			file, file->path, file->source, file->flag, file->job);
+
+	/* Some ConfFile objects won't have any JobClass details, for example,
+	 * the ConfFile object associated with "/etc/init.conf".
+	 */
+	if (! file->job) {
+		nih_debug ("ConfFile %p: job: no JobClass object.", file);
+		return;
+	}
+
+	nih_debug ("ConfFile %p: job:", file);
+	debug_show_job_class (file->job);
+}
+
+void
+debug_show_conf_source (const ConfSource *source)
+{
+	nih_assert (source);
+
+	nih_debug ("ConfSource %p: path='%s', type=%x, flag=%x",
+			source, source->path, source->type, source->flag);
+
+	nih_debug ("ConfSource %p files (%d):", source,
+			debug_count_hash_entries (source->files));
+
+	NIH_HASH_FOREACH (source->files, file_iter) {
+		ConfFile *file = (ConfFile *)file_iter;
+		debug_show_conf_file (file);
+	}
+}
+
+void
+debug_show_conf_sources (void)
+{
+	nih_assert (conf_sources);
+
+	nih_debug ("conf_sources:");
+
+	NIH_LIST_FOREACH (conf_sources, iter) {
+		ConfSource *source = (ConfSource *)iter;
+		debug_show_conf_source (source);
+	}
+}
+
+#endif /* DEBUG */
+

=== modified file 'init/conf.h'
--- init/conf.h	2009-07-09 08:36:52 +0000
+++ init/conf.h	2011-04-27 14:11:41 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 #include <nih/list.h>
 #include <nih/watch.h>
 
+#include "session.h"
 #include "job_class.h"
 
 
@@ -47,6 +48,7 @@
 /**
  * ConfSource:
  * @entry: list header,
+ * @session: attached session,
  * @path: path to source,
  * @type: type of source,
  * @watch: NihWatch structure for automatic change notification,
@@ -64,6 +66,7 @@
  **/
 typedef struct conf_source {
 	NihList             entry;
+	Session *           session;
 	char               *path;
 	ConfSourceType      type;
 
@@ -122,7 +125,47 @@
 
 int         conf_file_destroy  (ConfFile *file);
 
-JobClass *  conf_select_job    (const char *name);
+JobClass *  conf_select_job    (const char *name, const Session *session);
+
+char *toggle_conf_name         (const void *parent, const char *path)
+	__attribute__ ((warn_unused_result, malloc));
+
+#ifdef DEBUG
+
+/* used for debugging only */
+
+size_t
+debug_count_hash_entries       (const NihHash *hash);
+
+size_t
+debug_count_list_entries       (const NihList *list)
+	__attribute__ ((unused));
+
+void
+debug_show_job_class           (const JobClass *job)
+	__attribute__ ((unused));
+
+void
+debug_show_job_classes         (void)
+	__attribute__ ((unused));
+
+void
+debug_show_event               (const Event *event)
+	__attribute__ ((unused));
+
+void
+debug_show_conf_file(const ConfFile *file)
+	__attribute__ ((unused));
+
+void
+debug_show_conf_source(const ConfSource *source)
+	__attribute__ ((unused));
+
+void
+debug_show_conf_sources(void)
+	__attribute__ ((unused));
+
+#endif
 
 NIH_END_EXTERN
 

=== modified file 'init/control.c'
--- init/control.c	2009-07-11 11:47:12 +0000
+++ init/control.c	2011-04-27 14:11:41 +0000
@@ -2,7 +2,7 @@
  *
  * control.c - D-Bus connections, objects and methods
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,8 +25,10 @@
 
 #include <dbus/dbus.h>
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -46,6 +48,7 @@
 #include "dbus/upstart.h"
 
 #include "environ.h"
+#include "session.h"
 #include "job_class.h"
 #include "blocked.h"
 #include "conf.h"
@@ -54,12 +57,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 session bus rather than the system bus.
+ *
+ * Used for testing.
+ **/
+int use_session_bus = FALSE;
 
 /**
  * control_server_address:
@@ -78,7 +88,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 +96,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 +200,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 +218,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;
 
@@ -382,7 +396,9 @@
 			 const char      *name,
 			 char           **job)
 {
-	JobClass *class;
+	Session  *session;
+	JobClass *class = NULL;
+	JobClass *global_class = NULL;
 
 	nih_assert (message != NULL);
 	nih_assert (name != NULL);
@@ -397,8 +413,30 @@
 		return -1;
 	}
 
-	/* Lookup the job and copy its path into the reply */
-	class = (JobClass *)nih_hash_lookup (job_classes, name);
+	/* Get the relevant session */
+	session = session_from_dbus (NULL, message);
+
+	/* Lookup the job */
+	class = (JobClass *)nih_hash_search (job_classes, name, NULL);
+
+	while (class && (class->session != session)) {
+
+		/* Found a match in the global session which may be used
+		 * later if no matching user session job exists.
+		 */
+		if ((! class->session) && (session && ! session->chroot))
+			global_class = class;
+
+		class = (JobClass *)nih_hash_search (job_classes, name,
+				&class->entry);
+	}
+
+	/* If no job with the given name exists in the appropriate
+	 * session, look in the global namespace (aka the NULL session).
+	 */ 
+	if (! class)
+		class = global_class;
+
 	if (! class) {
 		nih_dbus_error_raise_printf (
 			DBUS_INTERFACE_UPSTART ".Error.UnknownJob",
@@ -406,6 +444,7 @@
 		return -1;
 	}
 
+	/* Copy the path */
 	*job = nih_strdup (message, class->path);
 	if (! *job)
 		nih_return_system_error (-1);
@@ -432,6 +471,7 @@
 		      NihDBusMessage   *message,
 		      char           ***jobs)
 {
+	Session *session;
 	char   **list;
 	size_t   len;
 
@@ -445,9 +485,16 @@
 	if (! list)
 		nih_return_system_error (-1);
 
+	/* Get the relevant session */
+	session = session_from_dbus (NULL, message);
+
 	NIH_HASH_FOREACH (job_classes, iter) {
 		JobClass *class = (JobClass *)iter;
 
+		if ((class->session || (session && session->chroot))
+		    && (class->session != session))
+			continue;
+
 		if (! nih_str_array_add (&list, message, &len,
 					 class->path)) {
 			nih_error_raise_system ();
@@ -462,13 +509,24 @@
 }
 
 
+int
+control_emit_event (void            *data,
+		    NihDBusMessage  *message,
+		    const char      *name,
+		    char * const    *env,
+		    int              wait)
+{
+	return control_emit_event_with_file (data, message, name, env, wait, -1);
+}
+
 /**
- * control_emit_event:
+ * control_emit_event_with_file:
  * @data: not used,
  * @message: D-Bus connection and message received,
  * @name: name of event to emit,
  * @env: environment of environment,
- * @wait: whether to wait for event completion before returning.
+ * @wait: whether to wait for event completion before returning,
+ * @file: file descriptor.
  *
  * Implements the top half of the EmitEvent method of the com.ubuntu.Upstart
  * interface, the bottom half may be found in event_finished().
@@ -488,11 +546,12 @@
  * Returns: zero on success, negative value on raised error.
  **/
 int
-control_emit_event (void            *data,
-		    NihDBusMessage  *message,
-		    const char      *name,
-		    char * const    *env,
-		    int              wait)
+control_emit_event_with_file (void            *data,
+			      NihDBusMessage  *message,
+			      const char      *name,
+			      char * const    *env,
+			      int              wait,
+			      int              file)
 {
 	Event   *event;
 	Blocked *blocked;
@@ -505,6 +564,7 @@
 	if (! strlen (name)) {
 		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,
 					     _("Name may not be empty string"));
+		close (file);
 		return -1;
 	}
 
@@ -512,19 +572,36 @@
 	if (! environ_all_valid (env)) {
 		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,
 					     _("Env must be KEY=VALUE pairs"));
+		close (file);
 		return -1;
 	}
 
 	/* Make the event and block the message on it */
 	event = event_new (NULL, name, (char **)env);
-	if (! event)
-		nih_return_system_error (-1);
+	if (! event) {
+		nih_error_raise_system ();
+		close (file);
+		return -1;
+	}
+
+	event->fd = file;
+	if (event->fd >= 0) {
+		long flags;
+
+		flags = fcntl (event->fd, F_GETFD);
+		flags &= ~FD_CLOEXEC;
+		fcntl (event->fd, F_SETFD, flags);
+	}
+
+	/* Obtain the session */
+	event->session = session_from_dbus (NULL, message);
 
 	if (wait) {
 		blocked = blocked_new (event, BLOCKED_EMIT_METHOD, message);
 		if (! blocked) {
 			nih_error_raise_system ();
 			nih_free (event);
+			close (file);
 			return -1;
 		}
 
@@ -669,3 +746,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-04-27 14:11:41 +0000
@@ -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
 
@@ -60,6 +72,10 @@
 				   const char *name, char * const *env,
 				   int wait)
 	__attribute__ ((warn_unused_result));
+int  control_emit_event_with_file (void *data, NihDBusMessage *message,
+				   const char *name, char * const *env,
+				   int wait, int file)
+	__attribute__ ((warn_unused_result));
 
 int  control_get_version          (void *data, NihDBusMessage *message,
 				   char **version)
@@ -72,6 +88,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/event.c'
--- init/event.c	2010-12-14 15:32:41 +0000
+++ init/event.c	2011-04-27 14:11:41 +0000
@@ -2,7 +2,7 @@
  *
  * event.c - event queue and handling
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2009, 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 
 
 #include <string.h>
+#include <unistd.h>
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -123,6 +124,8 @@
 
 	nih_list_init (&event->entry);
 
+	event->session = NULL;
+	event->fd = -1;
 	event->progress = EVENT_PENDING;
 	event->failed = FALSE;
 
@@ -293,6 +296,13 @@
 	NIH_HASH_FOREACH_SAFE (job_classes, iter) {
 		JobClass *class = (JobClass *)iter;
 
+		/* Only affect jobs within the same session as the event
+		 * unless the event has no session, in which case do them
+		 * all.
+		 */
+		if (event->session && (class->session != event->session))
+			continue;
+
 		/* We stop first so that if an event is listed both as a
 		 * stop and start event, it causes an active running process
 		 * to be killed, the stop script then the start script to be
@@ -393,8 +403,16 @@
 				job->start_env = env;
 				nih_ref (job->start_env, job);
 
+				nih_discard (env);
+				env = NULL;
+
 				job_finished (job, FALSE);
 
+				NIH_MUST (event_operator_fds (class->start_on, job,
+							      &job->fds, &job->num_fds,
+							      &job->start_env, &len,
+							      "UPSTART_FDS"));
+
 				event_operator_events (job->class->start_on,
 						       job, &job->blocking);
 
@@ -459,6 +477,8 @@
 		nih_free  (blocked);
 	}
 
+	close (event->fd);
+
 	if (event->failed) {
 		char *name;
 
@@ -470,6 +490,7 @@
 			failed = NIH_MUST (nih_sprintf (NULL, "%s/failed",
 							event->name));
 			new_event = NIH_MUST (event_new (NULL, failed, NULL));
+			new_event->session = event->session;
 
 			if (event->env)
 				new_event->env = NIH_MUST (nih_str_array_copy (

=== modified file 'init/event.h'
--- init/event.h	2009-07-09 08:36:52 +0000
+++ init/event.h	2011-04-27 14:11:41 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,8 @@
 #include <nih/macros.h>
 #include <nih/list.h>
 
+#include "session.h"
+
 
 /**
  * EventProgress:
@@ -40,6 +42,7 @@
 /**
  * Event:
  * @entry: list header,
+ * @session: session the event is attached to,
  * @name: string name of the event,
  * @env: NULL-terminated array of environment variables,
  * @progress: progress of event,
@@ -61,8 +64,10 @@
 typedef struct event {
 	NihList          entry;
 
+	Session *        session;
  	char            *name;
 	char           **env;
+	int              fd;
 
 	EventProgress    progress;
 	int              failed;

=== modified file 'init/event_operator.c'
--- init/event_operator.c	2010-11-19 14:34:51 +0000
+++ init/event_operator.c	2011-04-27 14:11:41 +0000
@@ -552,6 +552,65 @@
 	return *env;
 }
 
+int *
+event_operator_fds (EventOperator *root,
+		    const void *parent,
+		    int **fds,
+		    size_t *num_fds,
+		    char          ***env,
+		    size_t          *len,
+		    const char      *key)
+{
+	nih_local char *evlist = NULL;
+
+	nih_assert (root != NULL);
+	nih_assert (fds != NULL);
+	nih_assert (num_fds != NULL);
+	nih_assert (env != NULL);
+	nih_assert (len != NULL);
+	nih_assert (key != NULL);
+
+	/* Initialise the event list variable with the name given. */
+	evlist = nih_sprintf (NULL, "%s=", key);
+	if (! evlist)
+		return NULL;
+
+	*num_fds = 0;
+	NIH_TREE_FOREACH_FULL (&root->node, iter,
+			       (NihTreeFilter)event_operator_filter, NULL) {
+		EventOperator *oper = (EventOperator *)iter;
+
+		if (oper->type != EVENT_MATCH)
+			continue;
+
+		nih_assert (oper->event != NULL);
+
+		if (oper->event->fd >= 0) {
+			*fds = nih_realloc (*fds, parent, sizeof (int) * (*num_fds + 1));
+			if (! *fds)
+				return NULL;
+
+			(*fds)[(*num_fds)++] = oper->event->fd;
+
+			if (evlist[strlen (evlist) - 1] != '=') {
+				if (! nih_strcat_sprintf (&evlist, NULL, " %d",
+							  oper->event->fd))
+					return NULL;
+			} else {
+				if (! nih_strcat_sprintf (&evlist, NULL, "%d",
+							  oper->event->fd))
+					return NULL;
+			}
+		}
+	}
+
+	if (*num_fds)
+		if (! environ_add (env, parent, len, TRUE, evlist))
+			return NULL;
+
+	return (void *)1;
+}
+
 /**
  * event_operator_events:
  * @root: operator tree to collect from,

=== modified file 'init/event_operator.h'
--- init/event_operator.h	2009-06-23 09:29:35 +0000
+++ init/event_operator.h	2011-04-27 14:11:41 +0000
@@ -95,6 +95,14 @@
 char **        event_operator_environment (EventOperator *root, char ***env,
 					   const void *parent, size_t *len,
 					   const char *key);
+int *
+event_operator_fds (EventOperator *root,
+		    const void *parent,
+		    int **fds,
+		    size_t *num_fds,
+		    char          ***env,
+		    size_t          *len,
+		    const char      *key);
 void           event_operator_events      (EventOperator *root,
 					   const void *parent, NihList *list);
 

=== modified file 'init/job.c'
--- init/job.c	2010-12-14 15:32:41 +0000
+++ init/job.c	2011-04-27 14:11:41 +0000
@@ -47,6 +47,7 @@
 #include "events.h"
 #include "environ.h"
 #include "process.h"
+#include "session.h"
 #include "job_class.h"
 #include "job.h"
 #include "job_process.h"
@@ -99,8 +100,14 @@
 
 	job->class = class;
 
-	job->path = nih_dbus_path (job, DBUS_PATH_UPSTART, "jobs",
-				   class->name, job->name, NULL);
+	if (job->class->session && job->class->session->chroot) {
+		/* JobClass already contains a valid D-Bus path prefix for the job */
+		job->path = nih_dbus_path (job, class->path, job->name, NULL);
+	} else {
+		job->path = nih_dbus_path (job, DBUS_PATH_UPSTART, "jobs",
+				class->name, job->name, NULL);
+	}
+
 	if (! job->path)
 		goto error;
 
@@ -118,6 +125,9 @@
 			goto error;
 	}
 
+	job->fds = NULL;
+	job->num_fds = 0;
+
 	job->pid = nih_alloc (job, sizeof (pid_t) * PROCESS_LAST);
 	if (! job->pid)
 		goto error;
@@ -906,6 +916,7 @@
 	}
 
 	event = NIH_MUST (event_new (NULL, name, env));
+	event->session = job->class->session;
 
 	if (block) {
 		Blocked *blocked;
@@ -1102,11 +1113,22 @@
 	   NihDBusMessage  *message,
 	   int              wait)
 {
+	Session *session;
 	Blocked *blocked = NULL;
 
 	nih_assert (job != NULL);
 	nih_assert (message != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != job->class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			job_name (job));
+		return -1;
+	}
+
 	if (job->goal == JOB_START) {
 		nih_dbus_error_raise_printf (
 			DBUS_INTERFACE_UPSTART ".Error.AlreadyStarted",
@@ -1166,11 +1188,22 @@
 	  NihDBusMessage *message,
 	  int             wait)
 {
+	Session *session;
 	Blocked *blocked = NULL;
 
 	nih_assert (job != NULL);
 	nih_assert (message != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != job->class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			job_name (job));
+		return -1;
+	}
+
 	if (job->goal == JOB_STOP) {
 		nih_dbus_error_raise_printf (
 			DBUS_INTERFACE_UPSTART ".Error.AlreadyStopped",
@@ -1231,11 +1264,22 @@
 	     NihDBusMessage *message,
 	     int             wait)
 {
+	Session *session;
 	Blocked *blocked = NULL;
 
 	nih_assert (job != NULL);
 	nih_assert (message != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != job->class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			job_name (job));
+		return -1;
+	}
+
 	if (job->goal == JOB_STOP) {
 		nih_dbus_error_raise_printf (
 			DBUS_INTERFACE_UPSTART ".Error.AlreadyStopped",

=== modified file 'init/job.h'
--- init/job.h	2009-07-03 16:38:02 +0000
+++ init/job.h	2011-04-27 14:11:41 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -134,6 +134,9 @@
 	char          **stop_env;
 	EventOperator  *stop_on;
 
+	int *fds;
+	size_t num_fds;
+
 	pid_t          *pid;
 	Event          *blocker;
 	NihList         blocking;

=== modified file 'init/job_class.c'
--- init/job_class.c	2010-12-14 15:30:06 +0000
+++ init/job_class.c	2011-04-27 14:11:41 +0000
@@ -44,6 +44,7 @@
 
 #include "environ.h"
 #include "process.h"
+#include "session.h"
 #include "job_class.h"
 #include "job.h"
 #include "event_operator.h"
@@ -99,7 +100,7 @@
 
 /* Prototypes for static functions */
 static void job_class_add    (JobClass *class);
-static int  job_class_remove (JobClass *class);
+static int  job_class_remove (JobClass *class, const Session *session);
 
 
 /**
@@ -127,13 +128,15 @@
 
 /**
  * job_class_new:
+ *
  * @parent: parent for new job class,
- * @name: name of new job class.
+ * @name: name of new job class,
+ * @session: session.
  *
- * Allocates and returns a new JobClass structure with the @name given.
- * It will not be automatically added to the job classes table, it is up
- * to the caller to ensure this is done using job_class_register() once
- * the class has been set up.
+ * Allocates and returns a new JobClass structure with the given @name
+ * and @session. It will not be automatically added to the job classes
+ * table, it is up to the caller to ensure this is done using
+ * job_class_register() once the class has been set up.
  *
  * If @parent is not NULL, it should be a pointer to another object which
  * will be used as a parent for the returned job class.  When all parents
@@ -144,7 +147,8 @@
  **/
 JobClass *
 job_class_new (const void *parent,
-	       const char *name)
+	       const char *name,
+	       Session *   session)
 {
 	JobClass *class;
 	int       i;
@@ -164,8 +168,41 @@
 	if (! class->name)
 		goto error;
 
-	class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
-				     class->name, NULL);
+	class->session = session;
+	if (class->session
+	    && class->session->chroot
+	    && class->session->user) {
+		nih_local char *uid = NULL;
+
+		uid = nih_sprintf (NULL, "%d", class->session->user);
+		if (! uid)
+			goto error;
+
+		class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
+					     session->chroot, uid,
+					     class->name, NULL);
+
+	} else if (class->session
+		   && class->session->chroot) {
+		class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
+					     session->chroot,
+					     class->name, NULL);
+
+	} else if (class->session
+		   && class->session->user) {
+		nih_local char *uid = NULL;
+
+		uid = nih_sprintf (NULL, "%d", class->session->user);
+		if (! uid)
+			goto error;
+
+		class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
+					     uid, class->name, NULL);
+
+	} else {
+		class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
+					     class->name, NULL);
+	}
 	if (! class->path)
 		goto error;
 
@@ -220,7 +257,7 @@
 	class->chdir = NULL;
 
 	class->deleted = FALSE;
-	class->debug   = FALSE;
+	class->debug = FALSE;
 
 	return class;
 
@@ -243,19 +280,27 @@
 int
 job_class_consider (JobClass *class)
 {
-	JobClass *registered, *best;
+	JobClass *registered = NULL, *best = NULL;
 
 	nih_assert (class != NULL);
 
 	job_class_init ();
 
-	best = conf_select_job (class->name);
+	best = conf_select_job (class->name, class->session);
 	nih_assert (best != NULL);
-
-	registered = (JobClass *)nih_hash_lookup (job_classes, class->name);
+	nih_assert (best->session == class->session);
+
+	registered = (JobClass *)nih_hash_search (job_classes, class->name, NULL);
+
+	/* If we found an entry, ensure we only consider the appropriate session */
+	while (registered && registered->session != class->session)
+	{
+		registered = (JobClass *)nih_hash_search (job_classes, class->name, &registered->entry);
+	}
+
 	if (registered != best) {
 		if (registered)
-			if (! job_class_remove (registered))
+			if (! job_class_remove (registered, class->session))
 				return FALSE;
 
 		job_class_add (best);
@@ -280,18 +325,25 @@
 int
 job_class_reconsider (JobClass *class)
 {
-	JobClass *registered, *best;
+	JobClass *registered = NULL, *best = NULL;
 
 	nih_assert (class != NULL);
 
 	job_class_init ();
 
-	best = conf_select_job (class->name);
-
-	registered = (JobClass *)nih_hash_lookup (job_classes, class->name);
+	best = conf_select_job (class->name, class->session);
+
+	registered = (JobClass *)nih_hash_search (job_classes, class->name, NULL);
+
+	/* If we found an entry, ensure we only consider the appropriate session */
+	while (registered && registered->session != class->session)
+	{
+		registered = (JobClass *)nih_hash_search (job_classes, class->name, &registered->entry);
+	}
+
 	if (registered == class) {
 		if (class != best) {
-			if (! job_class_remove (class))
+			if (! job_class_remove (class, class->session))
 				return FALSE;
 
 			job_class_add (best);
@@ -332,19 +384,24 @@
 
 /**
  * job_class_remove:
- * @class: class to remove.
+ * @class: class to remove,
+ * @session: Session of @class.
  *
  * Removes @class from the hash table and unregisters it from all current
  * D-Bus connections.
  *
  * Returns: TRUE if class could be unregistered, FALSE if there are
- * active instances that prevent unregistration.
+ * active instances that prevent unregistration, or if @session
+ * does not match the session associated with @class.
  **/
 static int
-job_class_remove (JobClass *class)
+job_class_remove (JobClass *class, const Session *session)
 {
 	nih_assert (class != NULL);
 
+	if (class->session != session)
+		return FALSE;
+
 	control_init ();
 
 	/* Return if we have any active instances */
@@ -694,6 +751,7 @@
 		 char * const    *env,
 		 int              wait)
 {
+	Session         *session;
 	Blocked         *blocked = NULL;
 	Job             *job;
 	nih_local char **start_env = NULL;
@@ -704,6 +762,16 @@
 	nih_assert (message != NULL);
 	nih_assert (env != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			class->name);
+		return -1;
+	}
+
 	/* Verify that the environment is valid */
 	if (! environ_all_valid (env)) {
 		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,
@@ -813,6 +881,7 @@
 		char * const   *env,
 		int             wait)
 {
+	Session         *session;
 	Blocked         *blocked = NULL;
 	Job             *job;
 	nih_local char **stop_env = NULL;
@@ -823,6 +892,16 @@
 	nih_assert (message != NULL);
 	nih_assert (env != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			class->name);
+		return -1;
+	}
+
 	/* Verify that the environment is valid */
 	if (! environ_all_valid (env)) {
 		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,
@@ -937,6 +1016,7 @@
 		   char * const    *env,
 		   int              wait)
 {
+	Session         *session;
 	Blocked         *blocked = NULL;
 	Job             *job;
 	nih_local char **restart_env = NULL;
@@ -947,6 +1027,16 @@
 	nih_assert (message != NULL);
 	nih_assert (env != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			class->name);
+		return -1;
+	}
+
 	/* Verify that the environment is valid */
 	if (! environ_all_valid (env)) {
 		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,

=== modified file 'init/job_class.h'
--- init/job_class.h	2010-12-14 15:30:06 +0000
+++ init/job_class.h	2011-04-27 14:11:41 +0000
@@ -35,6 +35,7 @@
 
 #include "process.h"
 #include "event_operator.h"
+#include "session.h"
 
 
 /**
@@ -71,6 +72,7 @@
  * @entry: list header,
  * @name: unique name,
  * @path: path of D-Bus object,
+ * @session: attached session,
  * @instance: pattern to uniquely identify multiple instances,
  * @instances: hash table of active instances,
  * @description: description; intended for humans,
@@ -109,6 +111,7 @@
 
 	char           *name;
 	char           *path;
+	Session *       session;
 
 	char           *instance;
 	NihHash        *instances;
@@ -159,7 +162,8 @@
 void        job_class_init                 (void);
 
 JobClass  * job_class_new                  (const void *parent,
-					    const char *name)
+					    const char *name,
+					    Session *session)
 	__attribute__ ((warn_unused_result, malloc));
 
 int         job_class_consider             (JobClass *class);

=== modified file 'init/job_process.c'
--- init/job_process.c	2011-03-22 17:46:46 +0000
+++ init/job_process.c	2011-04-27 14:11:41 +0000
@@ -41,6 +41,7 @@
 #include <unistd.h>
 #include <utmp.h>
 #include <utmpx.h>
+#include <pwd.h>
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -511,6 +512,16 @@
 		}
 	}
 
+	/* Handle changing a chroot session job prior to dealing with
+	 * the 'chroot' stanza.
+	 */
+	if (class->session && class->session->chroot) {
+		if (chroot (class->session->chroot) < 0) {
+			nih_error_raise_system ();
+			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_CHROOT, 0);
+		}
+	}
+
 	/* Change the root directory, confining path resolution within it;
 	 * we do this before the working directory call so that is always
 	 * relative to the new root.
@@ -566,6 +577,54 @@
 		}
 	}
 
+	/* Handle unprivileged user job by dropping privileges to
+	 * their level.
+	 */
+	if (class->session && class->session->user) {
+		uid_t uid = class->session->user;
+		struct passwd *pw = NULL;
+
+		/* D-Bus does not expose a public API call to allow
+		 * us to query a users primary group.
+		 * _dbus_user_info_fill_uid () seems to exist for this
+		 * purpose, but is a "secret" API. It is unclear why
+		 * D-Bus neglects the gid when it allows the uid
+		 * to be queried directly.
+		 *
+		 * Our only recourse is to disallow user sessions in a
+		 * chroot and assume that all other user sessions
+		 * originate from the local system. In this way, we can
+		 * bypass D-Bus and use getpwuid ().
+		 */
+
+		if (class->session->chroot) {
+			/* We cannot determine the group id of the user
+			 * session in the chroot via D-Bus, so disallow
+			 * all jobs in such an environment.
+			 */
+			_nih_error_raise (__FILE__, __LINE__, __FUNCTION__,
+					EPERM, strerror (EPERM));
+		}
+
+		pw = getpwuid (uid);
+
+		if (!pw)
+			nih_return_system_error (-1);
+
+		nih_assert (pw->pw_uid == uid);
+
+		if (uid && setuid (uid) < 0) {
+			nih_error_raise_system ();
+			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_SETUID, 0);
+		}
+
+		if (pw->pw_gid && setgid (pw->pw_gid) < 0) {
+			nih_error_raise_system ();
+			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_SETGID, 0);
+		}
+	}
+
+
 	/* Execute the process, if we escape from here it failed */
 	if (execvp (argv[0], argv) < 0) {
 		nih_error_raise_system ();

=== modified file 'init/job_process.h'
--- init/job_process.h	2009-07-09 11:01:53 +0000
+++ init/job_process.h	2011-04-27 14:11:41 +0000
@@ -45,7 +45,9 @@
 	JOB_PROCESS_ERROR_CHROOT,
 	JOB_PROCESS_ERROR_CHDIR,
 	JOB_PROCESS_ERROR_PTRACE,
-	JOB_PROCESS_ERROR_EXEC
+	JOB_PROCESS_ERROR_EXEC,
+	JOB_PROCESS_ERROR_SETUID,
+	JOB_PROCESS_ERROR_SETGID,
 } JobProcessErrorType;
 
 /**

=== modified file 'init/main.c'
--- init/main.c	2011-03-16 22:54:56 +0000
+++ init/main.c	2011-04-27 14:11:41 +0000
@@ -71,6 +71,8 @@
 static void usr1_handler    (void *data, NihSignal *signal);
 #endif /* DEBUG */
 
+static void handle_confdir  (void);
+
 
 /**
  * argv0:
@@ -90,12 +92,53 @@
 
 
 /**
+ * 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;
+
+extern int disable_sessions;
+
+/**
  * 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, "startup-event", N_("specify an alternative initial event (for testing)"),
+		NULL, "NAME", &initial_event, NULL },
+
+	{ 0, "no-startup-event", N_("do not emit any startup event (for testing)"),
+		NULL, NULL, &disable_startup_event, NULL },
+
+	{ 0, "no-sessions", N_("Disable user and chroot sessions"),
+		NULL, NULL, &disable_sessions, 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 },
 
 	/* Ignore invalid options */
 	{ '-', "--", NULL, NULL, NULL, NULL, NULL },
@@ -124,7 +167,11 @@
 	if (! args)
 		exit (1);
 
+	handle_confdir ();
+	control_handle_bus_type ();
+
 #ifndef DEBUG
+<<<<<<< TREE
 	/* Check we're root */
 	if (getuid ()) {
 		nih_fatal (_("Need to be root"));
@@ -208,10 +255,105 @@
 			  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 ());
+		if (system_setup_console (CONSOLE_NONE, FALSE) < 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 ());
+	}
+
+>>>>>>> MERGE-SOURCE
 #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 +365,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 +382,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 */
 
 
@@ -278,26 +424,28 @@
 
 
 	/* 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, DEFAULT_CONFFILE, CONF_FILE));
+	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,6 +461,7 @@
 	}
 
 #ifndef DEBUG
+<<<<<<< TREE
 	/* Now that the startup is complete, send all further logging output
 	 * to kmsg instead of to the console.
 	 */
@@ -320,14 +469,32 @@
 		nih_free (nih_error_get ());
 
 	nih_log_set_logger (logger_kmsg);
+=======
+	if (use_session_bus == FALSE) {
+		/* Now that the startup is complete, send all further logging output
+		 * to syslog instead of to the console.
+		 */
+		openlog (program_name, LOG_CONS, LOG_DAEMON);
+		nih_log_set_logger (nih_logger_syslog);
+	}
+>>>>>>> MERGE-SOURCE
 #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;
 
@@ -336,6 +503,9 @@
 		sigprocmask (SIG_SETMASK, &mask, NULL);
 	}
 
+	if (disable_sessions)
+		nih_debug ("Sessions disabled");
+
 	/* Run through the loop at least once to deal with signals that were
 	 * delivered to the previous process while the mask was set or to
 	 * process the startup event we emitted.
@@ -573,3 +743,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 = DEFAULT_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-03-15 18:36:57 +0000
+++ init/man/init.5	2011-04-27 14:11:41 +0000
@@ -1,42 +1,117 @@
-.TH init 5 2010-12-14 "Upstart"
+.TH init 5 2011-03-03 "Upstart"
 .\"
 .SH NAME
 init \- Upstart init daemon job configuration
 .\"
 .SH SYNOPSIS
-.B /etc/init
+.B /etc/init/
+
+.B $HOME/.init/
 .\"
 .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
+If D\-Bus has been configured to allow non\-privileged users to invoke all
+Upstart D\-Bus methods, Upstart is also able to manage User Jobs. See
+.B User Jobs
+for further details.
+
+To be considered by Upstart, files in this directory must have a
+recognized suffix and may also be present in sub\-directories.  There are
+two recognized suffixes:
+
+.IP \(bu 4 
+Files ending in
 .I .conf
-and may also be present in sub-directories.
-
-Each file defines a single service or task, with the name taken from its
-relative path within the directory without the extension.  For example a
-job defined in
-.I /etc/init/rc-sysinit.conf
+are called configuration files, or simply "conf files" for short.
+These are the primary vehicle for specifying a job.
+.IP \(bu 4 
+Files ending in
+.I .override
+are called override files.  If an override file is present, the stanzas
+it contains take precedence over those equivalently named stanzas in the
+corresponding configuration file contents for a particular job.
+The main use for override files is to modify how a job will run without
+having to modify its configuration file directly.  See the section
+\fBOverride File Handling\fP below for further details.
+.P
+A job can thus be defined by either:
+.IP \[bu] 2
+A single configuration file.
+.IP \[bu]
+A single configuration file \fBand\fP a single override file.
+.P
+Unless explicitly stated otherwise, any reference to a jobs
+configuration can refer both to a configuration file or an override
+file.
+
+Each configuration file defines the template for a single \fIservice\fP
+(long\-running process or daemon) or \fItask\fP (short\-lived process).
+
+Note that a configuration file is not itself a job: it is a description
+of an environmenta job could be run in.  A job is the runtime embodiment
+of a configuration file.
+
+The configuration file name as displayed by Upstart and associated
+tooling is taken from its relative path within the directory without the
+extension.  For example a configuration file
+.I /etc/init/rc\-sysinit.conf
 is named
-.IR rc-sysinit ,
-while a job defined in
+.IR rc\-sysinit ,
+while a configuration file
 .I /etc/init/net/apache.conf
 is named
 .IR net/apache .
-
-These files are plain text and should not be executable.
-.\"
-.SS Format
+Since override files only modify the way a configuration file is
+interpreted, they are not named.
+
+Configuration files are plain text and should not be executable.
+.\"
+.SS User Jobs
+
+A User Job is a job configuration file created by a non\-privileged user
+in the
+.B $HOME/.init/
+directory. Job configuration files in this directory have
+the same syntax as system job configuration files.
+
+Any user can create user jobs, but that user can control
+.I only
+jobs they create.
+
+Users are able to manage their jobs using the standard
+.BR initctl (8)
+facility.
+
+Note that a user job configuration file cannot have the same name as a
+system job configuration file.
+
+.\"
+.SS Chroot Support
+
+Upstart is able to manage jobs within a \fBchroot\fP(2). To control jobs
+within the chroot environment, use the standard
+.BR initctl (8)
+facility. Note that it is not necessary to install D\-Bus within the
+chroot (in fact it is not recommended).
+
+Note that User Jobs can be created within a chroot environment.
+
+.\"
+.SS Configuration File Format
 Each line begins with a configuration stanza and continues until either
 the end of the line or a line containing a closing stanza.  Line breaks
 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 +144,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 +153,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 +167,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 +180,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 +197,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 +211,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 +219,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