lp:~jamesodhunt/upstart/bug-1159895

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1480

Stéphane Graber (community): Approve on 2013-06-03

James Hunt: Needs Resubmitting on 2013-06-03

Diff: 501 lines (+167/-56)

5 files modified

ChangeLog (+21/-0)
init/job_class.c (+11/-4)
init/job_process.c (+0/-3)
util/man/initctl.8 (+7/-4)
util/tests/test_initctl.c (+128/-45)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1159895: Allow for unsetting inherited variables

Undecided

Fix Released

Link a bug report

Related blueprints

1480. By James Hunt on 2013-06-20

Sync with lp:upstart.

1479. By James Hunt on 2013-06-03

* util/tests/test_initctl.c:
  - test_no_inherit_job_env(): New function to test --no-inherit-env.
  - test_job_env():
    - Move code that sets HOME+PATH if not set from
      test_default_job_env() so that test_no_inherit_job_env() can make
      use of it.
    - Session file cleanup tweaks to work with test_no_inherit_job_env().

1478. By James Hunt on 2013-05-31

* util/man/initctl.8: Update on behaviour.

1477. By James Hunt on 2013-05-31

* init/job_class.c: job_class_environment_init(): Copy inits environment
  to the default job class environment for user mode where appropriate.
* init/job_process.c: job_process_run(): Don't copy inits environment
  into the job instances environment table as those values are now
  already in the table.
* util/tests/test_initctl.c: Updates for new behaviour (where
  'list-env' will now contain the entire environment of the init
  process, not just those variables explicitly set via set-env).

1476. By James Hunt on 2013-05-30

* Sync with lp:upstart.

1475. By James Hunt on 2013-05-07

* util/man/shutdown.8: Specify default action is to bring system
  down to single-user mode (LP: #1065851).

1474. By James Hunt on 2013-04-30

* Merge of lp:~jamesodhunt/upstart/bug-1157713-inotify-test-failures.

1473. By James Hunt on 2013-04-22

* Typo and doc changes.

1472. By James Hunt on 2013-04-02

* extra/man/file-event.7: Correct EVENT values in examples.
* extra/man/upstart-event-bridge.8:
  - Corrected bridge name.
  - Explain that blocking semantics of system jobs not retained.

1471. By James Hunt on 2013-03-28

* init/job_process.[ch]: Remove unused
  JOB_PROCESS_ERROR_OPENPT_MASTER.