Created by James Hunt on 2013-10-25 and last modified on 2013-11-04
Get this branch:
bzr branch lp:~jamesodhunt/upstart/bug-1235649
Only James Hunt can upload to this branch. If you are James Hunt please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

James Hunt

Recent revisions

1548. By James Hunt on 2013-11-04

* Sync with lp:upstart.

1547. By James Hunt on 2013-10-25

* dbus/com.ubuntu.Upstart.xml: Added 'NotifyDBusAddress' method.
* init/control.c:
  - control_bus_open(): Connect to the D-Bus bus specified
    by control_bus_address when running as a Session Init (LP: #1203595, #1235649).
  - control_disconnected(): Display calculated bus type rather than hard-coding.
  - control_handle_bus_type(): Removed.
  - control_get_bus_type(): Determine type of D-Bus bus that will be used.
  - control_notify_dbus_address(): Implementation of D-Bus 'NotifyDBusAddress' method
    that sets control_bus_address.
* init/main.c:
  - main():
    - Just check USE_SESSION_BUS_ENV variable rather than calling
    - Don't register SIGUSR1 handler for Session Init.
  - usr1_handler(): Display calculated bus type rather than hard-coding.
* init/test_control.c: Updated strings used by tests which check error
  messages to include 'D-Bus'.
* util/initctl.c: Added new 'notify-dbus-address' command.
* util/man/initctl.8:
  - Documentation for new 'notify-dbus-address' command.
  - reset-env: Troff fix.
  - Explain '--user' implicit in user mode.
* util/tests/test_initctl.c: test_dbus_connection(): New function providing
  the following new tests:
  - "ensure non-priv non-Session Init connects to D-Bus session bus on startup".
  - "ensure Session Init does not connect to D-Bus session bus on startup".
  - "ensure Session Init connects to D-Bus session bus when notified".
  - "ensure Session Init does not connect to another bus when notified twice".

1545. By Steve Langasek on 2013-10-23

syntax fix

1544. By James Hunt on 2013-10-23

* util/initctl.h: IS_INIT_EVENT(): Ignore session end event when
  running in user mode (for 'check-config').

1543. By Scott James Remnant (Canonical) on 2013-10-03

Do not respawn jobs, that are being stopped and running pre-stop already.

1540. By James Hunt on 2013-10-04

* Merge of lp:~xnox/upstart/fix-1234841.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.