Merge lp:~jamesodhunt/upstart/bug-1083723-reprise into lp:~upstart-devel/upstart/1.6
Proposed by
James Hunt
Status: | Merged |
---|---|
Merged at revision: | 1397 |
Proposed branch: | lp:~jamesodhunt/upstart/bug-1083723-reprise |
Merge into: | lp:~upstart-devel/upstart/1.6 |
Diff against target: |
62 lines (+22/-3) 3 files modified
ChangeLog (+5/-0) dbus/com.ubuntu.Upstart.xml (+3/-1) util/telinit.c (+14/-2) |
To merge this branch: | bzr merge lp:~jamesodhunt/upstart/bug-1083723-reprise |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stéphane Graber (community) | Approve | ||
Colin Watson (community) | Approve | ||
Upstart Developers | Pending | ||
Review via email:
|
Description of the change
* dbus/com.
manifest this is an async call.
* util/telinit.c: restart_upstart(): Use the async call to avoid the
client-side complaining if it detects that Upstart has severed all
D-Bus connections in preparation for the re-exec.
To post a comment you must log in.
I haven't checked all the generated function types, but this looks broadly reasonable to me.