lp:~stgraber/upstart/upstart-inherit-env-no-override
- Get this branch:
- bzr branch lp:~stgraber/upstart/upstart-inherit-env-no-override
Branch merges
- James Hunt: Approve
-
Diff: 23 lines (+4/-5)1 file modifiedinit/job_process.c (+4/-5)
Branch information
Recent revisions
- 1431. By Stéphane Graber
-
Make sure the inherited environment can't override upstart's own environment.
- 1429. By Dimitri John Ledkov
-
Move inherit_env declaration to an object that is linked into the tests.
- 1426. By James Hunt
-
* init/control.c:
- Use control_check_permissio n() 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
-
* 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
-
* 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. - 1423. By James Hunt
-
* util/initctl.c:
- get_job_details(): Fix order in which arguments are checked. - 1422. By James Hunt
-
* init/control.c:
- control_get_env(): Allow PID 1 environment to be queried for
consistency with control_list_env().
* init/man/initctl.8:
- Added --job, --instance, --global options for list-env, set-env,
get-env, unset-env, reset-env.
- Explain PID 1 limitation for set-env, unset-env, reset-env.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:upstart