Dimitri John Ledkov has proposed merging
lp:~xnox/upstart/do-not-launch-session-dbus into lp:upstart.
Requested reviews:
Upstart Reviewers (upstart-reviewers)
Related bugs:
Bug #1315767 in upstart : "upstart works as expected, notify-dbus-address
tests fail depending on system-wide session jobs"
https://bugs.launchpad.net/upstart/+bug/1315767
For more details, see:
https://code.launchpad.net/~xnox/upstart/do-not-launch-session-dbus/+merge/218684
--
https://code.launchpad.net/~xnox/upstart/do-not-launch-session-dbus/+merge/218684
Your team Upstart Reviewers is requested to review the proposed merge of
lp:~xnox/upstart/do-not-launch-session-dbus into lp:upstart.
=== 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:12: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
