Merge lp:~ubuntu-branches/ubuntu/lucid/initramfs-tools/lucid-201002221143 into lp:ubuntu/lucid/initramfs-tools

[James Westby]

[James Westby (james-w)]

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.

Unmerged revisions

163. By Steve Langasek on 2010-02-22

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 on 2010-02-21

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 on 2010-02-21

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.

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-22 00:20:22 +0000
+++ debian/changelog	2010-02-22 11:48:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 initramfs-tools (0.92bubuntu66) lucid; urgency=low
 
   * scripts/local-premount/resume: wait-for-root will handle both UUID= and
@@ -14,6 +15,24 @@
 
  -- Steve Langasek <[e-mail]>  Mon, 22 Feb 2010 00:20:22 -0800
 
+=======
+initramfs-tools (0.92bubuntu66) UNRELEASED; urgency=low
+
+  * 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.
+  * 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!
+  * 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.
+
+ -- Steve Langasek <[e-mail]>  Sun, 21 Feb 2010 13:23:09 -0800
+
+>>>>>>> MERGE-SOURCE
 initramfs-tools (0.92bubuntu65) lucid; urgency=low
 
   * scripts/init-premount/blacklist: Move to init-top so it has a chance