* util/grub.d/10_linux.in: Don't use UUID for LVM root.

diff --git a/ChangeLog b/ChangeLog
index 341e122f3f713900dd75c6ae53eadd9b948fdfdc..e60f1076c6e2faabedb42c56e2478aaacda9582c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-01  Sean Finney  <seanius@seanius.net>
+
+       * util/grub.d/10_linux.in: Don't use UUID for LVM root.
+
 2010-07-01  Sean Finney  <seanius@seanius.net>
 
        * disk/lvm.c (grub_lvm_scan_device): Skip snapshots.

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 57bc1eebc17d302ec2933206aa7237caba82b114..2e0143df28d4efa175dc00d78483735d99378926 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -44,7 +44,8 @@ case ${GRUB_DEVICE} in
 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}" \
+    || [ "x`grub-probe -t abstraction --device ${GRUB_DEVICE}`" = "xlvm"  ] ; then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}