- merged 2.12 from PLD

[packages/grub2.git] / grub-lvmdevice.patch

diff --git a/grub-lvmdevice.patch b/grub-lvmdevice.patch
index 0a15cdcdf59fa70cdb794a8dcb9ac1a9899cad1d..85ae59694b997c4e33e170a971f1082dc26a7b00 100644 (file)
--- a/grub-lvmdevice.patch
+++ b/grub-lvmdevice.patch
@@ -1,7 +1,6 @@
-diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mkconfig.in
---- grub-2.02-beta3.orig/util/grub-mkconfig.in 2016-03-21 07:42:22.000000000 +0000
-+++ grub-2.02-beta3/util/grub-mkconfig.in      2016-03-21 07:44:37.320768000 +0000
-@@ -133,6 +133,21 @@
+--- grub-2.02~beta2/util/grub-mkconfig.in~     2014-01-13 16:12:41.020705075 +0200
++++ grub-2.02~beta2/util/grub-mkconfig.in      2014-01-13 16:10:42.000000000 +0200
+@@ -131,6 +131,21 @@
  
  # Device containing our userland.  Typically used for root= parameter.
  GRUB_DEVICE="`${grub_probe} --target=device /`"
@@ -21,5 +20,5 @@ diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mk
 +esac
 +
  GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
+ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2> /dev/null`" || true
  
- # Device containing our /boot partition.  Usually the same as GRUB_DEVICE.