← Back to branch summary

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

« 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: 2008-09-06 14:56:38 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20080906145638-bebxruprp7sacwon
Tags: 1.96+20080724-10
http://bugs.debian.org/496040
http://bugs.debian.org/496820
http://bugs.debian.org/489287
http://bugs.debian.org/494589
http://bugs.debian.org/497889
* patches/03_disable_floppies.diff: Free .drive struct member when skipping
  floppy drives.  (Closes: #496040)
* patches/902_boot_blocklist_hack.diff: Support separate /boot when using
  blocklists.  (Closes: #496820, #489287, #494589)
* patches/00_ntfs_insensitive.diff: They say NTFS is an insensitive fool.
  It must be true! (use case insensitive match in NTFS) (Closes: #497889)

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}