Merge authors:
Stéphane Graber (stgraber)
Related merge proposals:
https://code.launchpad.net/~stgraber/upstart/upstart-fix-env-test/+merge/150447
proposed by: Stéphane Graber (stgraber)
review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1438 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Tue 2013-02-26 16:45:33 +0000
message:
Merge of lp:~stgraber/upstart/upstart-fix-env-test.
modified:
init/main.c
util/tests/test_initctl.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'init/main.c'
--- init/main.c 2013-02-25 09:42:11 +0000
+++ init/main.c 2013-02-25 21:49:35 +0000
@@ -210,6 +210,9 @@
control_handle_bus_type ();
+ if (! user_mode)
+ no_inherit_env = TRUE;
+
#ifndef DEBUG
if (use_session_bus == FALSE && user_mode == FALSE) {
=== modified file 'util/tests/test_initctl.c'
--- util/tests/test_initctl.c 2013-02-26 16:31:52 +0000
+++ util/tests/test_initctl.c 2013-02-26 16:45:33 +0000
@@ -824,6 +824,9 @@
NIH_MUST (nih_str_array_add (&args, NULL, NULL,
"--no-sessions"));
+ NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+ "--no-inherit-env"));
+
if (confdir) {
NIH_MUST (nih_str_array_add (&args, NULL, NULL,
"--confdir"));
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
