Merge lp:~jamesodhunt/upstart/telinit-private-socket into lp:upstart

Proposed by James Hunt on 2014-01-15
Status: Merged
Merged at revision: 1590
Proposed branch: lp:~jamesodhunt/upstart/telinit-private-socket
Merge into: lp:upstart
Diff against target: 34 lines (+7/-2)
2 files modified
ChangeLog (+5/-0)
util/telinit.c (+2/-2)
To merge this branch: bzr merge lp:~jamesodhunt/upstart/telinit-private-socket
Reviewer Review Type Date Requested Status
St├ęphane Graber 2014-01-15 Approve on 2014-01-15
Review via email: mp+201760@code.launchpad.net
To post a comment you must log in.
St├ęphane Graber (stgraber) wrote :

Looks good to me.

(I didn't get to test this on an affected system, but the problem seems pretty obvious and so is the fix)

review: Approve
James Hunt (jamesodhunt) wrote :

I've tested the scenario on real hardware and in a trusty LXC container.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2014-01-08 16:47:16 +0000
3+++ ChangeLog 2014-01-15 11:52:50 +0000
4@@ -1,3 +1,8 @@
5+2014-01-15 James Hunt <james.hunt@ubuntu.com>
6+
7+ * util/telinit.c: upstart_open(): Connect using private socket
8+ for systems without D-Bus.
9+
10 2014-01-08 James Hunt <james.hunt@ubuntu.com>
11
12 * init/man/init.5: Explain valid syntax for stanzas
13
14=== modified file 'util/telinit.c'
15--- util/telinit.c 2013-08-22 11:13:41 +0000
16+++ util/telinit.c 2014-01-15 11:52:50 +0000
17@@ -123,7 +123,7 @@
18
19 dbus_error_init (&dbus_error);
20
21- connection = dbus_bus_get (DBUS_BUS_SYSTEM, &dbus_error);
22+ connection = dbus_connection_open (DBUS_ADDRESS_UPSTART, &dbus_error);
23 if (! connection) {
24 nih_dbus_error_raise (dbus_error.name, dbus_error.message);
25 dbus_error_free (&dbus_error);
26@@ -134,7 +134,7 @@
27 dbus_error_free (&dbus_error);
28
29 upstart = nih_dbus_proxy_new (parent, connection,
30- DBUS_SERVICE_UPSTART,
31+ NULL,
32 DBUS_PATH_UPSTART,
33 NULL, NULL);
34 if (! upstart) {

Subscribers

People subscribed via source and target branches