mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
94 lines
3 KiB
Diff
94 lines
3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Steve Langasek <steve.langasek@ubuntu.com>
|
|
Date: Mon, 13 Jan 2014 12:13:12 +0000
|
|
Subject: [PATCH] Output a menu entry for firmware setup on UEFI FastBoot
|
|
systems
|
|
|
|
If fastboot is enabled in the BIOS then often it is not possible to
|
|
enter the firmware setup menu, add a menu entry for this.
|
|
|
|
hdegoede: Cherry picked the Ubuntu patch from:
|
|
https://git.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu/tree/debian/patches/uefi_firmware_setup.patch
|
|
Into the Fedora / RH grub version
|
|
|
|
According to:
|
|
https://git.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu/tree/debian/copyright
|
|
The patch is licensed under GPL-3+
|
|
|
|
[hdegoede: fix use with /sys/firmware/efi/efivars]
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
Makefile.util.def | 6 ++++++
|
|
util/grub.d/30_uefi-firmware.in | 46 +++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 52 insertions(+)
|
|
create mode 100644 util/grub.d/30_uefi-firmware.in
|
|
|
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
|
index 8b376d6e740..56bf1159a42 100644
|
|
--- a/Makefile.util.def
|
|
+++ b/Makefile.util.def
|
|
@@ -536,6 +536,12 @@ script = {
|
|
installdir = grubconf;
|
|
};
|
|
|
|
+script = {
|
|
+ name = '30_uefi-firmware';
|
|
+ common = util/grub.d/30_uefi-firmware.in;
|
|
+ installdir = grubconf;
|
|
+};
|
|
+
|
|
script = {
|
|
name = '40_custom';
|
|
common = util/grub.d/40_custom.in;
|
|
diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
|
|
new file mode 100644
|
|
index 00000000000..93ececffea7
|
|
--- /dev/null
|
|
+++ b/util/grub.d/30_uefi-firmware.in
|
|
@@ -0,0 +1,46 @@
|
|
+#! /bin/sh
|
|
+set -e
|
|
+
|
|
+# grub-mkconfig helper script.
|
|
+# Copyright (C) 2012 Free Software Foundation, Inc.
|
|
+#
|
|
+# GRUB is free software: you can redistribute it and/or modify
|
|
+# it under the terms of the GNU General Public License as published by
|
|
+# the Free Software Foundation, either version 3 of the License, or
|
|
+# (at your option) any later version.
|
|
+#
|
|
+# GRUB is distributed in the hope that it will be useful,
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+# GNU General Public License for more details.
|
|
+#
|
|
+# You should have received a copy of the GNU General Public License
|
|
+# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
+
|
|
+prefix="@prefix@"
|
|
+exec_prefix="@exec_prefix@"
|
|
+datarootdir="@datarootdir@"
|
|
+
|
|
+export TEXTDOMAIN=@PACKAGE@
|
|
+export TEXTDOMAINDIR="@localedir@"
|
|
+
|
|
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
|
|
+
|
|
+efi_vars_dir=/sys/firmware/efi/efivars
|
|
+EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
|
|
+OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE"
|
|
+
|
|
+if [ -e "$OsIndications" ] && \
|
|
+ [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b5)") & 1 ))" = 1 ]; then
|
|
+ LABEL="System setup"
|
|
+
|
|
+ gettext_printf "Adding boot menu entry for EFI firmware configuration\n" >&2
|
|
+
|
|
+ onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
|
+
|
|
+ cat << EOF
|
|
+menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
|
|
+ fwsetup
|
|
+}
|
|
+EOF
|
|
+fi
|