Merge lp:~3v1n0/upstart/activation-proper-dbus-path into lp:upstart

Proposed by Marco Trevisan (Treviño) on 2016-05-06
Status: Merged
Merged at revision: 1669
Proposed branch: lp:~3v1n0/upstart/activation-proper-dbus-path
Merge into: lp:upstart
Diff against target: 14 lines (+3/-1)
1 file modified
init/control.c (+3/-1)
To merge this branch: bzr merge lp:~3v1n0/upstart/activation-proper-dbus-path
Reviewer Review Type Date Requested Status
Upstart Reviewers 2016-05-06 Pending
Review via email: mp+294025@code.launchpad.net

Commit message

Control: use the /org/freedesktop/DBus canonical path for updating the activation environment variables

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'init/control.c'
--- init/control.c 2015-05-16 19:12:37 +0000
+++ init/control.c 2016-05-06 16:06:27 +0000
@@ -1445,7 +1445,9 @@
1445 dbus_vars[0]->item1 = nih_strdup (dbus_vars[0], "");1445 dbus_vars[0]->item1 = nih_strdup (dbus_vars[0], "");
1446 }1446 }
14471447
1448 dbus_proxy = NIH_SHOULD (nih_dbus_proxy_new (dbus_vars, control_bus, "org.freedesktop.DBus", "/", NULL, NULL));1448 dbus_proxy = NIH_SHOULD (nih_dbus_proxy_new (dbus_vars, control_bus,
1449 "org.freedesktop.DBus", "/org/freedesktop/DBus", NULL, NULL));
1450
1449 if (! dbus_proxy) {1451 if (! dbus_proxy) {
1450 nih_warn (_("Failed to get dbus_proxy"));1452 nih_warn (_("Failed to get dbus_proxy"));
1451 } else {1453 } else {

Subscribers

People subscribed via source and target branches