Created by James Hunt on 2013-10-11 and last modified on 2013-11-04
Get this branch:
bzr branch lp:~jamesodhunt/upstart/bug-1238078
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

1551. By James Hunt on 2013-11-04

* Sync with lp:upstart.

1550. By James Hunt on 2013-11-04

* util/tests/test_initctl.c: test_reexec(): Fixed behaviour and comments
  for test "ensure 'set-env --global' persists across session-init

1549. By James Hunt on 2013-11-04

* test/test_util_common.h: WAIT_FOR_FILE(): Check @path not logfile.

1548. By James Hunt on 2013-10-24

* Sync with lp:upstart.

1547. By James Hunt on 2013-10-24

* init/tests/test_state.c: Removed some redundant JSON upgrade
  tests and renamed some existing data files to reflect the
  serialisation format version they encapsulate.

1546. By James Hunt on 2013-10-14

* init/job_class.c: job_class_environment_clear(): Utility function
  exposed primarily to allow tests to invalidate job_environ.
* init/tests/test_state.c:
  - Added appropriate calls to job_class_environment_clear().
  - New JSON data tests added:
    - upstart-no-job-environ.json
    - upstart-with-job-environ.json
    - session-init-no-job-environ.json
    - session-init-with-job-environ.json
    - session-init-with-modified-job-environ.json

1545. By James Hunt on 2013-10-11

* test/test_util_common.c:
  - session_init_reexec(): New.
  - set_upstart_session(): Whitespace.
* test/test_util_common.h: REEXEC_UPSTART(): Update to handle Session
  Inits too.
* util/man/initctl.8: Clarify 'set-env' behaviour.
* util/tests/test_initctl.c: New tests:
  - "ensure 'set-env' persists across session-init re-exec".
  - "ensure 'set-env --global' persists across session-init re-exec".

1544. By James Hunt on 2013-10-11

* init/job_class.c:
  - job_class_serialise_job_environ(): New function to serialise global
    job environment table.
  - job_class_deserialise_job_environ(): New function to deserialise global
    job environment table.
* init/state.c:
  - state_to_string(): Serialise global job environment table
    (LP: #1238078).
  - state_from_string(): Deserialise global job environment table.
  - _state_deserialise_str_array(): Don't attempt to free array if type
    check fails.

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

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

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.