Merge authors:
Dimitri John Ledkov (xnox)
Related merge proposals:
https://code.launchpad.net/~xnox/upstart/do-not-launch-session-dbus/+merge/218684
proposed by: Dimitri John Ledkov (xnox)
review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1620 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Thu 2014-05-08 09:25:21 +0100
message:
* Merge of lp:~xnox/upstart/do-not-launch-session-dbus.
modified:
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 'util/tests/test_initctl.c'
--- util/tests/test_initctl.c 2014-04-11 18:51:23 +0000
+++ util/tests/test_initctl.c 2014-05-07 19:08:35 +0000
@@ -17263,7 +17263,10 @@
assert0 (unsetenv ("DBUS_SYSTEM_BUS_ADDRESS"));
assert0 (unsetenv ("DBUS_SESSION_BUS_ADDRESS"));
- START_UPSTART (upstart_pid, TRUE);
+ nih_local char **extra = NULL;
+ extra = NIH_MUST (nih_str_array_new (NULL));
+ NIH_MUST (nih_str_array_add (&extra, NULL, NULL,"--no-startup-event"));
+ start_upstart_common (&(upstart_pid), TRUE, FALSE, NULL, NULL, extra);
/* Pass the D-Bus session bus address to the Session Init */
cmd = nih_sprintf (NULL, "%s notify-dbus-address \"%s\" 2>&1",
@@ -17333,7 +17336,7 @@
assert0 (unsetenv ("DBUS_SYSTEM_BUS_ADDRESS"));
assert0 (unsetenv ("DBUS_SESSION_BUS_ADDRESS"));
- START_UPSTART (upstart_pid, TRUE);
+ start_upstart_common (&(upstart_pid), TRUE, FALSE, NULL, NULL, extra);
/* Pass the first D-Bus session bus address to the Session Init */
cmd = nih_sprintf (NULL, "%s notify-dbus-address \"%s\" 2>&1",
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
