X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=grub-lvmdevice.patch;h=e28add5846592d1eb9651d0db067f2cb1da74a61;hb=426225c9c03230c46b0a2e4930febcc9820ab5c9;hp=8f04e80f4d0794d93c790654ca5a8cd074ed6fc0;hpb=aa528887623d790d843bfd61de72b8d222fbf6d6;p=packages%2Fgrub2.git

diff --git a/grub-lvmdevice.patch b/grub-lvmdevice.patch
index 8f04e80..e28add5 100644
--- a/grub-lvmdevice.patch
+++ b/grub-lvmdevice.patch
@@ -1,6 +1,7 @@
---- grub-1.97.1/util/grub-mkconfig.in~	2009-11-17 17:02:16.626243372 +0200
-+++ grub-1.97.1/util/grub-mkconfig.in	2009-11-17 17:02:08.346050859 +0200
-@@ -120,6 +120,27 @@
+diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkconfig.in
+--- grub-2.02-rc1.orig/util/grub-mkconfig.in	2017-02-08 15:00:50.000000000 +0000
++++ grub-2.02-rc1/util/grub-mkconfig.in	2017-02-08 15:02:35.564319810 +0000
+@@ -133,6 +133,21 @@ fi
  
  # Device containing our userland.  Typically used for root= parameter.
  GRUB_DEVICE="`${grub_probe} --target=device /`"
@@ -11,17 +12,11 @@
 +# /dev/mapper/vg--meaw-root -> /dev/vg-meaw/root
 +case "$GRUB_DEVICE" in
 +	/dev/mapper/*-*)
-+		DM_REAL_DEVICE="$(readlink -f "$GRUB_DEVICE")"
-+		DM_UUID="$(cat /sys/block/${DM_REAL_DEVICE#/dev/}/dm/uuid)"
-+		case "$DM_UUID" in
-+			LVM-*)
-+				# change "--" to / (as "/" is impossible in LV name)
-+				local dev=$(awk -vdev="${GRUB_DEVICE#/dev/mapper/}" 'BEGIN{gsub(/--/, "/", dev); print dev}')
-+				local VG=$(awk -vdev="$dev" 'BEGIN{split(dev, v, "-"); gsub("/", "-", v[1]); print v[1]}')
-+				local LV=$(awk -vdev="$dev" 'BEGIN{split(dev, v, "-"); gsub("/", "-", v[2]); print v[2]}')
-+				GRUB_DEVICE=/dev/$VG/$LV
-+				;;
-+		esac
++		LVM2_LV_NAME='' LVM2_VG_NAME=''
++		eval $(lvs --noheadings --nameprefixes "$GRUB_DEVICE" 2>/dev/null)
++		if [ -n "$LVM2_VG_NAME$LVM2_LV_NAME" ]; then
++			GRUB_DEVICE=/dev/$LVM2_VG_NAME/$LVM2_LV_NAME
++		fi
 +	;;
 +esac
 +