[PATCH] Fix root device detection for lvm2

[sean finney <seanius@debian.org>]

[-- Attachment #1.1: Type: text/plain, Size: 381 bytes --]

If you have a single / filesystem on lvm2, the boot process will hang
waiting for a root filesystem that never appears.  This patch modifies
the logic in deciding what the root device actually is, and allows the
initramfs to succesfully load the root filesystem.

The attached patch has been in use in the debian "grub2" packages for
quite a while, so I assume it's safe to use :)

[-- Attachment #1.2: 01_uuids_and_lvm_dont_play_along_nicely.diff --]
[-- Type: text/x-diff, Size: 611 bytes --]

Index: b/util/grub.d/10_linux.in
===================================================================
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -43,7 +43,8 @@
 esac
 
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
-    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ; then
+    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+    || [ "`grub-probe -t abstraction --device ${GRUB_DEVICE} | sed -e 's,.*\(lvm\).*,\1,'`" = "lvm"  ] ; then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 190 bytes --]