Merge lp:~ubuntu-branches/ubuntu/lucid/initramfs-tools/lucid-201002221143 into lp:ubuntu/lucid/initramfs-tools
Proposed by
James Westby
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/lucid/initramfs-tools/lucid-201002221143 |
| Merge into: | lp:ubuntu/lucid/initramfs-tools |
| Diff against target: |
33 lines (+19/-0) (has conflicts) 1 file modified
debian/changelog (+19/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/lucid/initramfs-tools/lucid-201002221143 |
| Related bugs: |
To post a comment you must log in.
Revision history for this message
| James Westby (james-w) wrote | # |
Unmerged revisions
- 163. By Steve Langasek
-
scripts/
local-premount/ resume: call 'plymouth message' before resuming,
to notify the user of the reason for the delay if the plymouth theme
supports it. - 162. By Steve Langasek
-
scripts/
local-premount/ resume: also recognize 'swsuspend' as a valid fs
type for a hibernation partition, since this is what udev returns for the
in-kernel hibernate/resume handling. Thanks to Peter Clifton for noticing
this! - 161. By Steve Langasek
-
scripts/
local-premount/ resume: wait-for-root will handle both UUID= and
/dev/disk/by-uuid, but /bin/resume from klibc will only handle the latter,
so revert the changes from 0.92bubuntu59 that dropped our fix-up of
device name. LP: #499940.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/initramfs-tools now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/initramfs-tools/lucid-201002221143. A merge should be performed if necessary.