Merge lp://staging/~jamesodhunt/ubuntu/oneiric/upstart/fix-for-810956 into lp://staging/ubuntu/oneiric/upstart
Proposed by
James Hunt
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 1318 | ||||
| Proposed branch: | lp://staging/~jamesodhunt/ubuntu/oneiric/upstart/fix-for-810956 | ||||
| Merge into: | lp://staging/ubuntu/oneiric/upstart | ||||
| Diff against target: |
182 lines (+52/-14) 5 files modified
ChangeLog (+9/-0) debian/changelog (+13/-0) init/control.c (+1/-1) init/main.c (+21/-11) util/tests/test_initctl.c (+8/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~jamesodhunt/ubuntu/oneiric/upstart/fix-for-810956 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
* Upstream cherry-pick to get dbus fix ("bzr merge -r 1314.. lp:upstart").
* init/main.c: main(): Add support for "/run" directory with
fallback to old location for initramfs state passing.
Note: D-Bus cherry-pick fix overcomes problems running with dbus session bus in chroot on oneiric (see bug 812940), which is required for the upstart tests (run as part of the package build) to complete successfully.
To post a comment you must log in.
Revision history for this message
| Colin Watson (cjwatson) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
