← Back to branch summary

~jamesodhunt/ubuntu/vivid/upstart/bug-1447756

« back to all changes in this revision

Viewing changes to util/telinit.c

  • Committer: James Hunt
  • Date: 2014-03-11 15:23:07 UTC
  • mfrom: (1182.135.76 upstart)
  • mto: This revision was merged to the branch mainline in revision 1544.
  • Revision ID: james.hunt@ubuntu.com-20140311152307-ad1wi9qxurjrui8j
Tags: upstream-1.12.1
Import upstream version 1.12.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
util/telinit.c
123
123
 
124
124
        dbus_error_init (&dbus_error);
125
125
 
126
 
        connection = dbus_bus_get (DBUS_BUS_SYSTEM, &dbus_error);
 
126
        connection = dbus_connection_open (DBUS_ADDRESS_UPSTART, &dbus_error);
127
127
        if (! connection) {
128
128
                nih_dbus_error_raise (dbus_error.name, dbus_error.message);
129
129
                dbus_error_free (&dbus_error);
134
134
        dbus_error_free (&dbus_error);
135
135
 
136
136
        upstart = nih_dbus_proxy_new (parent, connection,
137
 
                                      DBUS_SERVICE_UPSTART,
 
137
                                      NULL,
138
138
                                      DBUS_PATH_UPSTART,
139
139
                                      NULL, NULL);
140
140
        if (! upstart) {
174
174
         * Upstart has severed all connections to perform the re-exec.
175
175
         */
176
176
        ret = upstart_restart (upstart, NULL, NULL, NULL, 0);
 
177
        dbus_connection_flush(upstart->connection);
177
178
 
178
179
        /* We don't care about the return code, but we have to keep
179
180
         * the compiler happy.