← Back to branch summary

~ubuntu-branches/debian/sid/grub2/sid-200907171837

« back to all changes in this revision

Viewing changes to debian/patches/01_uuids_and_lvm_dont_play_along_nicely.diff

  • Committer: Bazaar Package Importer
  • Author(s): Robert Millan
  • Date: 2009-07-02 13:23:51 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090702132351-tanpn0ryyijp93gu
Tags: 1.96+20090702-1
http://bugs.debian.org/535026
* New SVN snapshot.
* rules: Remove duplicated files in sparc64-ieee1275 port.
* rules: Comment out -DGRUB_ASSUME_LINUX_HAS_FB_SUPPORT=1 setting.  We'll
  re-evaluate using it when it's more mature.  (Closes: #535026).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_uuids_and_lvm_dont_play_along_nicely.diff
 
1
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
 
2
index c2da413..cbd9d6b 100644
 
3
--- a/util/grub.d/10_linux.in
 
4
+++ b/util/grub.d/10_linux.in
 
5
@@ -36,7 +36,8 @@ case ${GRUB_DEVICE} in
 
6
 esac
 
7
 
 
8
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
 
9
-    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ; then
 
10
+    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
 
11
+    || [ "`grub-probe -t abstraction --device ${GRUB_DEVICE}`" = "lvm" ] ; then
 
12
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 
13
 else
 
14
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}