X-Git-Url: https://git.tld-linux.org/?p=packages%2Fgrub2.git;a=blobdiff_plain;f=grub-lvmdevice.patch;fp=grub-lvmdevice.patch;h=d9b6be7e4abd918224635490f0f752f762d77ddd;hp=e28add5846592d1eb9651d0db067f2cb1da74a61;hb=37c1d015a25095060b7e8e27365fa2767a402366;hpb=f95a1ca1ec8ddd7b01b033fd552bc7619faed11e diff --git a/grub-lvmdevice.patch b/grub-lvmdevice.patch index e28add5..d9b6be7 100644 --- a/grub-lvmdevice.patch +++ b/grub-lvmdevice.patch @@ -1,7 +1,7 @@ -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 +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 /`" @@ -21,5 +21,5 @@ diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkco +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.