lp:~jamesodhunt/upstart/bug-1235649

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1554

Dimitri John Ledkov: Approve on 2013-11-04

Diff: 817 lines (+477/-46)

9 files modified

ChangeLog (+39/-8)
dbus/com.ubuntu.Upstart.xml (+4/-0)
init/control.c (+111/-18)
init/control.h (+12/-1)
init/main.c (+22/-7)
init/tests/test_control.c (+2/-2)
util/initctl.c (+53/-4)
util/man/initctl.8 (+23/-6)
util/tests/test_initctl.c (+211/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1203595: session init, not available on dbus?	Undecided	Fix Released
Bug #1235649: uevent spam causes libdbus client code in session upstart to consume massive amounts of memory on Ubuntu Touch	Undecided	Fix Released

Link a bug report

Related blueprints

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
      control_handle_bus_type().
    - 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".

1546. By Steve Langasek on 2013-10-23

Merge lp:~xnox/upstart/fix-socket-bridge-path

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.

1542. By Steve Langasek on 2013-10-04

Merge lp:~vorlon/upstart/lp.1235480

1541. By Dimitri John Ledkov on 2013-10-04

merge lp:~jamesodhunt/upstart/bug-1234898

1540. By James Hunt on 2013-10-04

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

1539. By Dimitri John Ledkov on 2013-10-03

Merge lp:~jamesodhunt/upstart/bug-1089159