James Hunt has proposed merging lp:~jamesodhunt/upstart/telinit-private-socket 
into lp:upstart.

Requested reviews:
  Upstart Reviewers (upstart-reviewers)

For more details, see:
https://code.launchpad.net/~jamesodhunt/upstart/telinit-private-socket/+merge/201760
-- 
https://code.launchpad.net/~jamesodhunt/upstart/telinit-private-socket/+merge/201760
Your team Upstart Reviewers is requested to review the proposed merge of 
lp:~jamesodhunt/upstart/telinit-private-socket into lp:upstart.
=== modified file 'ChangeLog'
--- ChangeLog	2014-01-08 16:47:16 +0000
+++ ChangeLog	2014-01-15 11:52:50 +0000
@@ -1,3 +1,8 @@
+2014-01-15  James Hunt  <[email protected]>
+
+	* util/telinit.c: upstart_open(): Connect using private socket
+	  for systems without D-Bus.
+
 2014-01-08  James Hunt  <[email protected]>
 
 	* init/man/init.5: Explain valid syntax for stanzas

=== modified file 'util/telinit.c'
--- util/telinit.c	2013-08-22 11:13:41 +0000
+++ util/telinit.c	2014-01-15 11:52:50 +0000
@@ -123,7 +123,7 @@
 
 	dbus_error_init (&dbus_error);
 
-	connection = dbus_bus_get (DBUS_BUS_SYSTEM, &dbus_error);
+	connection = dbus_connection_open (DBUS_ADDRESS_UPSTART, &dbus_error);
 	if (! connection) {
 		nih_dbus_error_raise (dbus_error.name, dbus_error.message);
 		dbus_error_free (&dbus_error);
@@ -134,7 +134,7 @@
 	dbus_error_free (&dbus_error);
 
 	upstart = nih_dbus_proxy_new (parent, connection,
-				      DBUS_SERVICE_UPSTART,
+				      NULL,
 				      DBUS_PATH_UPSTART,
 				      NULL, NULL);
 	if (! upstart) {

-- 
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/upstart-devel

Reply via email to