grub files oops
This commit is contained in:
parent
e7daa4f684
commit
5c95fb445d
29
sys-boot/grub/files/gfxpayload.patch
Normal file
29
sys-boot/grub/files/gfxpayload.patch
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
From e2d5bf1bc6aaaabeba538c1ca94ea8601e4e1474 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Gilbert <floppym@gentoo.org>
|
||||||
|
Date: Thu, 16 Oct 2014 23:43:51 -0400
|
||||||
|
Subject: [PATCH] 10_linux: Default gfxpayload=keep only when booting using efi
|
||||||
|
|
||||||
|
vesafb seems to be unreliable when using BIOS compat mode.
|
||||||
|
|
||||||
|
---
|
||||||
|
util/grub.d/10_linux.in | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index d2e2a8f..a54b888 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -104,7 +104,9 @@ linux_entry ()
|
||||||
|
echo " load_video" | sed "s/^/$submenu_indentation/"
|
||||||
|
if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
|
||||||
|
&& grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
|
||||||
|
- echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
||||||
|
+ echo ' if [ "x$grub_platform" = xefi ]; then' | sed "s/^/$submenu_indentation/"
|
||||||
|
+ echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
||||||
|
+ echo ' fi' | sed "s/^/$submenu_indentation/"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
|
||||||
|
--
|
||||||
|
2.7.2
|
||||||
|
|
74
sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch
Normal file
74
sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch
Normal file
|
@ -0,0 +1,74 @@
|
||||||
|
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" ;;
|
||||||
|
--- a/util/grub-mkconfig.in
|
||||||
|
+++ b/util/grub-mkconfig.in
|
||||||
|
@@ -252,6 +252,7 @@
|
||||||
|
GRUB_BADRAM \
|
||||||
|
GRUB_OS_PROBER_SKIP_LIST \
|
||||||
|
GRUB_DISABLE_SUBMENU
|
||||||
|
+export GRUB_LINUX_KERNEL_GLOBS
|
||||||
|
|
||||||
|
if test "x${grub_cfg}" != "x"; then
|
||||||
|
rm -f "${grub_cfg}.new"
|
25
sys-boot/grub/files/grub-2.06-test-words.patch
Normal file
25
sys-boot/grub/files/grub-2.06-test-words.patch
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
From 0f5080a2f3c952e2ee00bd271f42c56bb955dc19 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Gilbert <floppym@gentoo.org>
|
||||||
|
Date: Sun, 14 Mar 2021 12:44:52 -0400
|
||||||
|
Subject: [PATCH] Use /usr/share/dict/words as a 'compressible' file
|
||||||
|
|
||||||
|
---
|
||||||
|
tests/util/grub-fs-tester.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
|
||||||
|
index bfc425e1f..efd2977b0 100644
|
||||||
|
--- a/tests/util/grub-fs-tester.in
|
||||||
|
+++ b/tests/util/grub-fs-tester.in
|
||||||
|
@@ -265,7 +265,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
|
||||||
|
MASTER="${tempdir}/master"
|
||||||
|
FSLABEL="grub_;/testé莭莽茝😁киритi urewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewrewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfew"
|
||||||
|
CFILESRC=
|
||||||
|
- for cand in /usr/share/dict/american-english /usr/share/dict/linux.words /data/data/com.termux/files/usr/share/hunspell/en_US.dic; do
|
||||||
|
+ for cand in /usr/share/dict/words; do
|
||||||
|
if test -f "$cand" ; then
|
||||||
|
CFILESRC="$cand"
|
||||||
|
break
|
||||||
|
--
|
||||||
|
2.31.0.rc1
|
||||||
|
|
38
sys-boot/grub/files/grub-2.12-fwsetup.patch
Normal file
38
sys-boot/grub/files/grub-2.12-fwsetup.patch
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
From 6e0b2277eba062bf7950536cd27f9789c545d20f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Gilbert <floppym@gentoo.org>
|
||||||
|
Date: Thu, 11 Apr 2024 15:33:45 -0400
|
||||||
|
Subject: [PATCH] grub.d: avoid calling fwsetup unconditionally
|
||||||
|
|
||||||
|
This causes grub to enter the firmware setup on boot when using a
|
||||||
|
grub core that does not support the 'fwsetup --is-supported' option.
|
||||||
|
|
||||||
|
Upstream has rejected attempts to resolve this, so we will carry this as
|
||||||
|
a distro patch for a bit.
|
||||||
|
|
||||||
|
Bug: https://bugs.gentoo.org/925370
|
||||||
|
---
|
||||||
|
util/grub.d/30_uefi-firmware.in | 9 +++------
|
||||||
|
1 file changed, 3 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
|
||||||
|
index 1c2365ddb..b6041b55e 100644
|
||||||
|
--- a/util/grub.d/30_uefi-firmware.in
|
||||||
|
+++ b/util/grub.d/30_uefi-firmware.in
|
||||||
|
@@ -32,11 +32,8 @@ gettext_printf "Adding boot menu entry for UEFI Firmware Settings ...\n" >&2
|
||||||
|
|
||||||
|
cat << EOF
|
||||||
|
if [ "\$grub_platform" = "efi" ]; then
|
||||||
|
- fwsetup --is-supported
|
||||||
|
- if [ "\$?" = 0 ]; then
|
||||||
|
- menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
|
||||||
|
- fwsetup
|
||||||
|
- }
|
||||||
|
- fi
|
||||||
|
+ menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
|
||||||
|
+ fwsetup
|
||||||
|
+ }
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
76
sys-boot/grub/files/grub.default-4
Normal file
76
sys-boot/grub/files/grub.default-4
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
# Copyright 1999-2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
#
|
||||||
|
# To populate all changes in this file you need to regenerate your
|
||||||
|
# grub configuration file afterwards:
|
||||||
|
# 'grub-mkconfig -o /boot/grub/grub.cfg'
|
||||||
|
#
|
||||||
|
# See the grub info page for documentation on possible variables and
|
||||||
|
# their associated values.
|
||||||
|
|
||||||
|
GRUB_DISTRIBUTOR="Gentoo"
|
||||||
|
|
||||||
|
# Default menu entry
|
||||||
|
#GRUB_DEFAULT=0
|
||||||
|
|
||||||
|
# Boot the default entry this many seconds after the menu is displayed
|
||||||
|
#GRUB_TIMEOUT=5
|
||||||
|
#GRUB_TIMEOUT_STYLE=menu
|
||||||
|
|
||||||
|
# Append parameters to the linux kernel command line
|
||||||
|
#GRUB_CMDLINE_LINUX=""
|
||||||
|
#
|
||||||
|
# Examples:
|
||||||
|
#
|
||||||
|
# Boot with network interface renaming disabled
|
||||||
|
# GRUB_CMDLINE_LINUX="net.ifnames=0"
|
||||||
|
#
|
||||||
|
# Boot with systemd instead of sysvinit (openrc)
|
||||||
|
# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
|
||||||
|
|
||||||
|
# Append parameters to the linux kernel command line for non-recovery entries
|
||||||
|
#GRUB_CMDLINE_LINUX_DEFAULT=""
|
||||||
|
|
||||||
|
# Uncomment to disable graphical terminal (grub-pc only)
|
||||||
|
#GRUB_TERMINAL=console
|
||||||
|
|
||||||
|
# The resolution used on graphical terminal.
|
||||||
|
# Note that you can use only modes which your graphic card supports via VBE.
|
||||||
|
# You can see them in real GRUB with the command `vbeinfo'.
|
||||||
|
#GRUB_GFXMODE=640x480
|
||||||
|
|
||||||
|
# Set to 'text' to force the Linux kernel to boot in normal text
|
||||||
|
# mode, 'keep' to preserve the graphics mode set using
|
||||||
|
# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
|
||||||
|
# graphics mode, or a sequence of these separated by commas or
|
||||||
|
# semicolons to try several modes in sequence.
|
||||||
|
#GRUB_GFXPAYLOAD_LINUX=
|
||||||
|
|
||||||
|
# Path to theme spec txt file.
|
||||||
|
# The starfield is by default provided with use truetype.
|
||||||
|
# NOTE: when enabling custom theme, ensure you have required font/etc.
|
||||||
|
#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
|
||||||
|
|
||||||
|
# Background image used on graphical terminal.
|
||||||
|
# Can be in various bitmap formats.
|
||||||
|
#GRUB_BACKGROUND="/boot/grub/mybackground.png"
|
||||||
|
|
||||||
|
# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
|
||||||
|
#GRUB_DISABLE_LINUX_UUID=true
|
||||||
|
|
||||||
|
# Comment if you don't want GRUB to pass "root=PARTUUID=xxx" parameter to kernel
|
||||||
|
GRUB_DISABLE_LINUX_PARTUUID=false
|
||||||
|
|
||||||
|
# Uncomment to disable generation of recovery mode menu entries
|
||||||
|
#GRUB_DISABLE_RECOVERY=true
|
||||||
|
|
||||||
|
# Uncomment to disable generation of the submenu and put all choices on
|
||||||
|
# the top-level menu.
|
||||||
|
# Besides the visual affect of no sub menu, this makes navigation of the
|
||||||
|
# menu easier for a user who can't see the screen.
|
||||||
|
#GRUB_DISABLE_SUBMENU=y
|
||||||
|
|
||||||
|
# Uncomment to play a tone when the main menu is displayed.
|
||||||
|
# This is useful, for example, to allow users who can't see the screen
|
||||||
|
# to know when they can make a choice on the menu.
|
||||||
|
#GRUB_INIT_TUNE="60 800 1"
|
3
sys-boot/grub/files/sbat.csv
Normal file
3
sys-boot/grub/files/sbat.csv
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
|
||||||
|
grub,3,Free Software Foundation,grub,%PV%,https//www.gnu.org/software/grub/
|
||||||
|
grub.gentoo,1,Gentoo,grub,%PV%,https://bugs.gentoo.org/
|
|
Loading…
Reference in a new issue