From: Sean Finney <seanius@seanius.net>
Date: Thu, 1 Jul 2010 21:24:21 +0000 (+0200)
Subject: 	* util/grub.d/10_linux.in: Don't use UUID for LVM root.
X-Git-Tag: 1.99~777
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=105a2e8c6638928330bcf5dfc6063474ac4ceb4a;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index 341e122f3..e60f1076c 100644
--- 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 57bc1eebc..2e0143df2 100644
--- 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}