diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2016-03-05 17:36:11 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2016-03-05 17:36:34 -0500 |
| commit | 20850e98766f137b01b6df134ed90bef9bc3d5e0 (patch) | |
| tree | d0cff9c06b3cc0df4f89ae3a4af0bb9e3827a686 | |
| parent | licenses: Remove unused license. (diff) | |
| download | gentoo-20850e98766f137b01b6df134ed90bef9bc3d5e0.tar.gz gentoo-20850e98766f137b01b6df134ed90bef9bc3d5e0.tar.bz2 gentoo-20850e98766f137b01b6df134ed90bef9bc3d5e0.zip | |
sys-boot/grub: Make GRUB_DISABLE_LINUX_UUID work again
Bug: https://bugs.gentoo.org/576528
Package-Manager: portage-2.2.27_p64
| -rw-r--r-- | sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch | 27 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.02_beta3-r1.ebuild (renamed from sys-boot/grub/grub-2.02_beta3.ebuild) | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch b/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch new file mode 100644 index 000000000000..1dcf3b5b781f --- /dev/null +++ b/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch @@ -0,0 +1,27 @@ +From ea8de5d2ee58178381e5809e4d5fe79861e61b04 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sat, 5 Mar 2016 17:21:15 -0500 +Subject: [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE + +Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to +mixing of || and && operators. Add some parens to help with that. +--- + util/grub.d/10_linux.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 5a78513..de9044c 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -47,7 +47,7 @@ esac + # and mounting btrfs requires user space scanning, so force UUID in this case. + if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ +- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then ++ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} + else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +-- +2.7.2 + diff --git a/sys-boot/grub/grub-2.02_beta3.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild index 350857b9672c..87d786d64fa3 100644 --- a/sys-boot/grub/grub-2.02_beta3.ebuild +++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild @@ -33,6 +33,7 @@ fi PATCHES=( "${FILESDIR}"/gfxpayload.patch "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch + "${FILESDIR}"/2.02_beta3-10_linux-UUID.patch ) DEJAVU=dejavu-sans-ttf-2.35 |