Merge lp://staging/~cjwatson/alsa-utils/mountall-deadlock into lp://staging/~ubuntu-audio-dev/alsa-utils/ubuntu.natty
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Merged at revision: | 82 |
| Proposed branch: | lp://staging/~cjwatson/alsa-utils/mountall-deadlock |
| Merge into: | lp://staging/~ubuntu-audio-dev/alsa-utils/ubuntu.natty |
| Diff against target: |
30 lines (+11/-1) 2 files modified
debian/alsa-restore.upstart (+1/-1) debian/changelog (+10/-0) |
| To merge this branch: | bzr merge lp://staging/~cjwatson/alsa-utils/mountall-deadlock |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Audio Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
I've uploaded this to natty, because the previous code deadlocks the boot process on systems with separate /usr and /var. The changelog should explain all:
* Remove '(mounted MOUNTPOINT=/usr) and (mounted MOUNTPOINT=/var)' from
/etc/
redundant, because runlevel [2345] already implies that /usr and /var
have been mounted, but it deadlocks mountall in the event of /usr and
/var both being separate filesystems (LP: #723482).
Please merge.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
