[Merge] lp:~jamesodhunt/upstart/bug-1159895 into lp:upstart

[James Hunt]

James Hunt has proposed merging lp:~jamesodhunt/upstart/bug-1159895 into lp:upstart.

Requested reviews:
  Upstart Reviewers (upstart-reviewers)
Related bugs:
  Bug #1159895 in upstart : "Allow for unsetting inherited variables"
  https://bugs.launchpad.net/upstart/+bug/1159895

For more details, see:
https://code.launchpad.net/~jamesodhunt/upstart/bug-1159895/+merge/166836

= Behaviour Change =

Previously running 'initctl list-env' in a Session Init environment would only list those minimal variables added by init (PATH and TERM) along with any variables explicitly set via 'initctl set-env'. However, it now lists that set plus all variables set in inits environment at startup time.

* 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).
* util/man/initctl.8: Update on behaviour.
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-1159895/+merge/166836
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bug-1159895 into lp:upstart.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 10996 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130531/66051c24/attachment.diff>