lp:~jamesodhunt/upstart/upstart-no-inherit-env

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1435

Stéphane Graber (community): Approve on 2013-02-15

Upstart Reviewers: Pending requested 2013-02-15

Diff: 93 lines (+19/-11)

4 files modified

ChangeLog (+8/-0)
init/job_process.c (+4/-4)
init/main.c (+3/-3)
init/man/init.8 (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1433. By James Hunt on 2013-02-15

* init/job_process.c: job_process_run(): Invert meaning.
* init/main.c: Change '--inherit-env' to '--no-inherit-env' such that
  inheriting inits environment is now the default for Session Inits.
* init/man/init.8: Update for '--no-inherit-env'.

1432. By James Hunt on 2013-02-14

* Merge of lp:~stgraber/upstart/upstart-inherit-env-no-override.

1431. By James Hunt on 2013-02-14

* init/main.c: Removed unused variable.

1430. By James Hunt on 2013-02-11

* Merge of lp:~stgraber/upstart/upstart-user-cwd.

1429. By Dimitri John Ledkov on 2013-02-11

Move inherit_env declaration to an object that is linked into the tests.

1428. By Steve Langasek on 2013-02-09

Merge support for --inherit-env

1427. By Steve Langasek on 2013-02-07

Merge change to drop explicit --instance, --job arguments to initctl setenv

1426. By James Hunt on 2013-01-31

* init/control.c:
  - Use control_check_permission() rather than
    control_get_origin_uid() directly.
* init/control.h: Prototypes.
* init/job_class.c: Change calls to job_class_environment_init()
  to asserts as the former only needs to be called once.
* init/main.c: main(): Make job_class_environment_init() call as
  early as possible.
* init/tests/test_event.c: main(): Call
  job_class_environment_init().
* util/tests/test_initctl.c:
  - test_default_job_env():
    - Set TERM and PATH if not set.
    - Check line counts before checking expected output.
  - test_clear_job_env():
    - Make use of TEST_INITCTL_DEFAULT_PATH.

1425. By James Hunt on 2013-01-31

* Sync with lp:upstart and resolve test issues relating to new session
  code. In so doing, the revised test suite found 3 bugs which are now
  fixed:

  - control_get_session(): We now actually pass @session as a parameter.
  - job_class_find(): Initialise class to avoid undefined behaviour.
    undefined behaviour.
  - get_env_action(): Wasn't passing job+instance details to init.

1424. By James Hunt on 2013-01-28

* util/Makefile.am: Define INITCTL_BINARY and UPSTART_BINARY to ensure
  full path available to tests.
* util/tests/test_initctl.c:
  - New macros:
    - _TEST_STR_ARRAY_CONTAINS()
    - TEST_STR_ARRAY_CONTAINS()
    - TEST_STR_ARRAY_NOT_CONTAINS()
    - _TEST_FILE_CONTAINS()
    - TEST_FILE_CONTAINS()
    - TEST_FILE_NOT_CONTAINS()
  - get_initctl(): Function to replace original INITCTL_BINARY define.
  - test_global_and_local_job_env(): New function to test initctl
    '--global', '--job' and '--instance' options from within and without
    a job.