lp:~jamesodhunt/upstart/bugs-1235649+1203595

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:upstart

Steve Langasek: Disapprove on 2013-10-23

Diff: 1044 lines (+730/-34)

13 files modified

ChangeLog (+48/-1)
init/control.c (+45/-12)
init/control.h (+5/-1)
init/environ.c (+4/-0)
init/job_class.c (+56/-6)
init/job_process.c (+1/-1)
init/main.c (+12/-5)
init/tests/test_control.c (+2/-2)
init/tests/test_environ.c (+457/-0)
test/test_util_common.c (+11/-1)
util/initctl.c (+2/-3)
util/man/initctl.8 (+2/-2)
util/tests/test_initctl.c (+85/-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

1545. By James Hunt on 2013-10-22

* init/control.c: control_bus_open(): Don't call nih_dbus_bus() if
  DBUS_SESSION_BUS_ADDRESS is not set to avoid D-bus auto-launching a
  dbus-daemon.
* init/environ.c: Comments.
* init/job_class.c:
  - job_class_environment_init(): Superior check on whether job_environ
    is not empty.
  - job_class_environment_reset(): Only reset job_environ if not NULL
    already.
  - job_class_environment_set(): Set variable in Upstarts environment
    too (required to allow Upstart to be aware of the D-Bus session bus
    address when the dbus-daemon is available).
  - job_class_environment_unset(): Unset variable from Upstarts
    environment, but only if it is not a default variable.
* init/job_process.c: Formatting.
* init/test_control.c: Updated strings used by tests which check error
  messages to include 'D-Bus'.
* init/test_environ.c:
  - test_add(): New test:
    - "using bare word with no corresponding variable set in environment"
  - test_remove(): New function ("the missing test") containing 8 new tests:
    - "remove name=value pair with empty table"
    - "remove bare name with empty table"
    - "remove name=value from table of size 1"
    - "remove bare name from table of size 1"
    - "remove first name=value entry from table of size 2"
    - "remove first bare name entry from table of size 2"
    - "remove last name=value entry from table of size 2"
    - "remove last bare name entry from table of size 2"
* test/test_util_common.c:
  - Formatting.
  - get_initctl(): Added environment checks.
* util/initctl.c:
  - Formatting.
  - Removed testing comment from option text for '--session'.
* util/man/initctl.8: Removed testing comment for '--session'.
* util/tests/test_initctl.c:
  - test_session_init(): New test that checks the Session Init now
    connects to the D-Bus session bus.

1544. By James Hunt on 2013-10-18

* Connect to the D-Bus session bus as well as using a private socket
  when running as a Session Init (LP: #1203595, #1235649).

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

1538. By James Hunt on 2013-10-02

* test/test_util_common.c:
  - set_upstart_session(): Call get_initctl_binary() rather than using
    define value.
  - get_initctl(): As above.
  - get_initctl_binary(): Check that file exists for parity with
    get_upstart_binary().

1537. By James Hunt on 2013-10-01

* extra/upstart-file-bridge.c:
  - upstart_job_added(): Make quieter in manner consistent with other
    bridges (only display output in debug mode).
  - upstart_job_removed(): As above.

1536. By James Hunt on 2013-10-01

* init/job_process.c:job_process_jobs_running(): Removed unused
  variables.