Merge authors:
Marco Trevisan (Treviño) (3v1n0)
Related merge proposals:
https://code.launchpad.net/~3v1n0/upstart/activation-proper-dbus-path/+merge/294025
proposed by: Marco Trevisan (Treviño) (3v1n0)
------------------------------------------------------------
revno: 1669 [merge]
committer: Dimitri John Ledkov <x...@ubuntu.com>
branch nick: trunk
timestamp: Fri 2016-05-13 09:46:32 +0100
message:
merge lp:~3v1n0/upstart/activation-proper-dbus-path
modified:
init/control.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/control.c'
--- init/control.c 2015-05-16 19:12:37 +0000
+++ init/control.c 2016-05-06 16:04:39 +0000
@@ -1445,7 +1445,9 @@
dbus_vars[0]->item1 = nih_strdup (dbus_vars[0], "");
}
- dbus_proxy = NIH_SHOULD (nih_dbus_proxy_new (dbus_vars, control_bus, "org.freedesktop.DBus", "/", NULL, NULL));
+ dbus_proxy = NIH_SHOULD (nih_dbus_proxy_new (dbus_vars, control_bus,
+ "org.freedesktop.DBus", "/org/freedesktop/DBus", NULL, NULL));
+
if (! dbus_proxy) {
nih_warn (_("Failed to get dbus_proxy"));
} else {
--
upstart-devel mailing list
upstart-devel@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
