lp:~jamesodhunt/upstart/upstream-add-session-bus-support

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1288

Upstart Developers: Pending requested 2011-06-03

Diff: 1773 lines (+536/-321)

21 files modified

ChangeLog (+31/-0)
configure.ac (+1/-1)
init/conf.c (+0/-1)
init/control.c (+33/-7)
init/control.h (+15/-1)
init/environ.c (+0/-1)
init/environ.h (+0/-1)
init/job_process.c (+0/-1)
init/job_process.h (+0/-1)
init/main.c (+154/-133)
init/man/init.8 (+6/-2)
init/tests/test_conf.c (+0/-1)
init/tests/test_control.c (+0/-1)
init/tests/test_environ.c (+0/-1)
init/tests/test_job_class.c (+0/-1)
init/tests/test_job_process.c (+0/-1)
po/upstart.pot (+206/-134)
util/initctl.c (+56/-13)
util/man/initctl.8 (+8/-2)
util/reboot.c (+0/-1)
util/tests/test_initctl.c (+26/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1285. By James Hunt on 2011-06-01

Add D-Bus session support to initctl.

* Changelog: Updated.
* util/initctl.c:
  - Added "--session" command-line option.
  - dbus_bus_type_setter(): New function used by option parser to
    distinguish system/session D-Bus bus type.
  - system_bus variable now replaced by two others: use_dbus (boolean)
    and dbus_bus_type.
  - upstart_open(): Updated to handle multiple D-Bus bus types.
* util/man/initctl.8: Update for "--session" option.
* util/tests/test_initctl.c: Updated to make use of use_dbus and
  dbus_bus_type rather than system_bus.

1284. By James Hunt on 2011-05-31

Upstream merge.

1283. By James Hunt on 2011-05-31

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.

1282. By Scott James Remnant (Canonical) on 2011-05-12

* init/job_class.h (JobClass): Add kill signal member
* init/job_class.c (job_class_new): Initialise kill signal
* init/tests/test_job_class.c (test_new): Check kill signal initialised
correctly.
* init/system.c (system_kill): Change to accept a signal rather than
a boolean.
* init/system.h: Update prototype
* init/tests/test_system.c (test_kill): Update tests to pass signals
by value.
* init/job_process.c (job_process_kill, job_process_kill_timer): Pass
the configured kill signal, or SIGKILL, to the function rather than
TRUE/FALSE.
* init/parse_job.c (stanza_kill): Add parsing for kill signal.
* init/tests/test_parse_job.c (test_stanza_kill): Check parsing works
* init/errors.h: Add illegal signal error and string.
* init/man/init.5: Update documentation

1281. By Scott James Remnant (Canonical) on 2011-05-12

* init/job_class.h (JobClass): Replace oom_adj with oom_score_adj
* init/job_class.c (job_class_new): Replace oom_adj with oom_score_adj.
* init/job_process.c (job_process_spawn): Write the new score
adjustment, falling back to calculating and writing the old value if
necessary.
* init/parse_job.c (stanza_oom): Parse both the new and old values,
converting the old value to the new value if present.
* init/errors.h: Add new error string.
* init/man/init.5: Documentation update.
* init/tests/test_job_class.c (test_new): Update check.
* init/tests/test_parse_job.c (test_stanza_oom): Update tests.

1280. By Scott James Remnant (Canonical) on 2011-05-12

* init/job_process.c (job_process_run): Always make the shell script
fd 9, since that's the highest that shells are required by POSIX to
support. Pass the file descriptor to job_process_spawn()
(job_process_run): Accept the extra file descriptor, moving it to fd 9.
(job_process_error_read): Add handling for error condition.
* init/job_process.h: Adjust prototypes, add constant
* init/tests/test_job_process.c (test_spawn): Add argument to call in
tests

1279. By Scott James Remnant (Canonical) on 2011-03-22

* configure.ac: Bump version to 1.3
* NEWS: Begin new release

1278. By Scott James Remnant (Canonical) on 2011-03-22

* NEWS: Release 1.2

1277. By Scott James Remnant (Canonical) on 2011-03-22

* init/job_process.c (job_process_run): Correct shell redirection;
the form we used dosen't work with at least pdksh

1276. By Scott James Remnant (Canonical) on 2011-03-17

* configure.ac: Bump version to 1.2
* NEWS: Begin new release