X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=grub-lvmdevice.patch;h=d9b6be7e4abd918224635490f0f752f762d77ddd;hb=37c1d015a25095060b7e8e27365fa2767a402366;hp=53324ec60fb34cdc1f3335c1e3c23ed95ae66103;hpb=874c4add0aa91b4d5d5a6665790c95d9f8757d81;p=packages%2Fgrub2.git

diff --git a/grub-lvmdevice.patch b/grub-lvmdevice.patch
index 53324ec..d9b6be7 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,21 @@
+diff -ur grub-2.04.orig/util/grub-mkconfig.in grub-2.04/util/grub-mkconfig.in
+--- grub-2.04.orig/util/grub-mkconfig.in	2019-08-18 15:43:15.196000000 +0200
++++ grub-2.04/util/grub-mkconfig.in	2019-08-18 15:43:33.498000000 +0200
+@@ -133,6 +133,21 @@
  
  # Device containing our userland.  Typically used for root= parameter.
  GRUB_DEVICE="`${grub_probe} --target=device /`"
@@ -10,15 +11,15 @@
 +# /dev/mapper/blodnatt-blah--bleh -> /dev/blodnatt/blah-bleh
 +# /dev/mapper/vg--meaw-root -> /dev/vg-meaw/root
 +case "$GRUB_DEVICE" in
-+/dev/mapper/*-*)
-+	# 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
-+;;
++	/dev/mapper/*-*)
++		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
 +
  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.