~vorlon/ubuntu/raring/upstart/lp.1199778

Viewing all changes in revision 1182.20.1.

  • Committer: James Hunt
  • Date: 2011-05-31 14:22:00 UTC
  • mto: (1182.14.25 upstart)
  • mto: This revision was merged to the branch mainline in revision 1317.
  • Revision ID: james.hunt@ubuntu.com-20110531142200-fg2069ychrny885d
Add command-line option to use D-Bus session bus (for testing).

* init/control.c:
  - Added new boolean use_session_bus.
  - Updated comments.
  - control_handle_bus_type(): New function to allow selection of
    session bus via env var "UPSTART_USE_SESSION_BUS".
    Also logs use of session bus if use_session_bus set.
  - control_bus_open(): Now connects to either D-Bus system bus or session bus.
* init/control.h: New define for USE_SESSION_BUS_ENV.
* init/main.c: Addition of "--session" command-line option.
* init/man/init.8: Update for new "--session" command-line option.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: