sys-boot/grub: backport LVM fix & configurable kernel globs

- Backport upstream LVM RAID1 fix
- GRUB_LINUX_KERNEL_GLOBS to tweak globs for finding kernels

Package-Manager: portage-2.2.24

2 files changed, 135 insertions, 0 deletions

diff --git a/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch b/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch
new file mode 100644
index 000000000000..c66ee68dc8de
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch
@@ -0,0 +1,67 @@
+From 43e3295aaad5278a1e53c5282e2660b72cd76d28 Mon Sep 17 00:00:00 2001
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Tue, 29 Dec 2015 15:29:14 -0800
+Subject: [PATCH] GRUB_LINUX_KERNEL_GLOBS: configurable kernel selection
+
+* util/grub.d/10_linux.in: Implement GRUB_LINUX_KERNEL_GLOBS
+* docs/grub.texi: Document GRUB_LINUX_KERNEL_GLOBS
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ docs/grub.texi          |  5 +++++
+ util/grub.d/10_linux.in | 21 +++++++++++----------
+ 2 files changed, 16 insertions(+), 10 deletions(-)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index 9a25a0b..d1129ec 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -1490,6 +1490,11 @@ This option may be set to a list of GRUB module names separated by spaces.
+ Each module will be loaded as early as possible, at the start of
+ @file{grub.cfg}.
+ 
++@item GRUB_LINUX_KERNEL_GLOBS
++This option may be set to override the list of path globs used to find Linux
++kernels. The defaults vary by architecture, and generally include both
++@file{/boot} and @file{/}.
++
+ @end table
+ 
+ The following options are still accepted for compatibility with existing
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 859b608..e5ac11d 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -145,18 +145,19 @@ EOF
+ }
+ 
+ machine=`uname -m`
+-case "x$machine" in
++globs="$GRUB_LINUX_KERNEL_GLOBS"
++[ -z "$globs" ] && case "x$machine" in
+     xi?86 | xx86_64)
+-	list=
+-	for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
+-	    if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
+-	done ;;
+-    *) 
+-	list=
+-	for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
+-                  if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
+-	done ;;
++	globs="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*"
++	;;
++    *)
++	globs="/boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-*"
++	;;
+ esac
++list=
++for i in ${globs} ; do
++    if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
++done
+ 
+ case "$machine" in
+     i?86) GENKERNEL_ARCH="x86" ;;
+-- 
+2.3.0
+
diff --git a/sys-boot/grub/files/grub-2.02_beta2-lvm2-raid1.patch b/sys-boot/grub/files/grub-2.02_beta2-lvm2-raid1.patch
new file mode 100644
index 000000000000..76c72a626325
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.02_beta2-lvm2-raid1.patch
@@ -0,0 +1,68 @@
+From: Andrei Borzenkov <arvidjaar@gmail.com>
+Date: Thu, 19 Mar 2015 18:30:27 +0000 (+0300)
+Subject: core: add LVM RAID1 support
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff_plain;h=527eeeeee6c8d3d8e3bb1fac408d47bb1dcbec95;hp=7c9309e50a124817e67de38b30c6291acecad560
+
+core: add LVM RAID1 support
+
+Closes 44534.
+---
+
+diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
+index 1e7f197..9b97004 100644
+--- a/grub-core/disk/lvm.c
++++ b/grub-core/disk/lvm.c
+@@ -577,13 +577,17 @@ grub_lvm_detect (grub_disk_t disk,
+ 		      if (is_pvmove)
+ 			seg->node_count = 1;
+ 		    }
+-		  else if (grub_memcmp (p, "raid", sizeof ("raid") - 1)
+-			   == 0 && (p[sizeof ("raid") - 1] >= '4'
+-				    && p[sizeof ("raid") - 1] <= '6')
++		  else if (grub_memcmp (p, "raid", sizeof ("raid") - 1) == 0
++			   && ((p[sizeof ("raid") - 1] >= '4'
++				&& p[sizeof ("raid") - 1] <= '6')
++			       || p[sizeof ("raid") - 1] == '1')
+ 			   && p[sizeof ("raidX") - 1] == '"')
+ 		    {
+ 		      switch (p[sizeof ("raid") - 1])
+ 			{
++			case '1':
++			  seg->type = GRUB_DISKFILTER_MIRROR;
++			  break;
+ 			case '4':
+ 			  seg->type = GRUB_DISKFILTER_RAID4;
+ 			  seg->layout = GRUB_RAID_LAYOUT_LEFT_ASYMMETRIC;
+@@ -608,16 +612,18 @@ grub_lvm_detect (grub_disk_t disk,
+ 			  goto lvs_segment_fail;
+ 			}
+ 
+-		      seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = ");
+-		      if (p == NULL)
++		      if (seg->type != GRUB_DISKFILTER_MIRROR)
+ 			{
++			  seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = ");
++			  if (p == NULL)
++			    {
+ #ifdef GRUB_UTIL
+-			  grub_util_info ("unknown stripe_size\n");
++			      grub_util_info ("unknown stripe_size\n");
+ #endif
+-			  goto lvs_segment_fail;
++			      goto lvs_segment_fail;
++			    }
+ 			}
+ 
+-
+ 		      seg->nodes = grub_zalloc (sizeof (seg->nodes[0])
+ 						* seg->node_count);
+ 
+@@ -625,7 +631,7 @@ grub_lvm_detect (grub_disk_t disk,
+ 		      if (p == NULL)
+ 			{
+ #ifdef GRUB_UTIL
+-			  grub_util_info ("unknown mirrors\n");
++			  grub_util_info ("unknown raids\n");
+ #endif
+ 			  goto lvs_segment_fail2;
+ 			}