From a485ecba3709c97d7635898b87fbb19a1b41dbe00afae04359d0d6c97c00e30a Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 12 Mar 2020 11:58:43 +0000
Subject: [PATCH] Accepting request 784214 from home:favogt:bsc1164385

- Adjust patch to make EFI detection a runtime decision (bsc#1164385):
  * grub2-SUSE-Add-the-t-hotkey.patch

OBS-URL: https://build.opensuse.org/request/show/784214
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=348
---
 grub2-SUSE-Add-the-t-hotkey.patch | 60 ++++++++++++++++---------------
 grub2.changes                     |  6 ++++
 grub2.spec                        |  4 +--
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/grub2-SUSE-Add-the-t-hotkey.patch b/grub2-SUSE-Add-the-t-hotkey.patch
index 2e84634..b2de145 100644
--- a/grub2-SUSE-Add-the-t-hotkey.patch
+++ b/grub2-SUSE-Add-the-t-hotkey.patch
@@ -11,18 +11,21 @@ allow them to get their boot menu on the serial console, let's add a new
 hidden option "t" that switches the output device back to the firmware default.
 
 Signed-off-by: Alexander Graf <agraf@suse.de>
-
 ---
 
 v1 -> v2
 
   - use hiddenentry instead of --hidden
 
-diff --git a/Makefile.util.def b/Makefile.util.def
-index f9caccb..d94de92 100644
---- a/Makefile.util.def
-+++ b/Makefile.util.def
-@@ -504,6 +504,12 @@ script = {
+v2 -> v3 (by fvogt@suse.de)
+
+  - make it a runtime decision (bsc#1164385)
+
+Index: grub-2.04/Makefile.util.def
+===================================================================
+--- grub-2.04.orig/Makefile.util.def
++++ grub-2.04/Makefile.util.def
+@@ -525,6 +525,12 @@ script = {
    installdir = grubconf;
  };
  
@@ -35,34 +38,35 @@ index f9caccb..d94de92 100644
  program = {
    mansection = 1;
    name = grub-mkrescue;
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a9023..b6ec7e2 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -184,6 +184,9 @@ EOF
- 	    fi
+Index: grub-2.04/util/grub.d/00_header.in
+===================================================================
+--- grub-2.04.orig/util/grub.d/00_header.in
++++ grub-2.04/util/grub.d/00_header.in
+@@ -240,6 +240,10 @@ EOF
  	fi
  
-+    if [ -d /sys/firmware/efi ]; then
-+      echo 'echo "Please press 't' to show the boot menu on this console"'
-+    fi
      cat << EOF
++  if [ "\${grub_platform}" = "efi" ]; then
++    echo "Please press 't' to show the boot menu on this console"
++  fi
++
    set gfxmode=${GRUB_GFXMODE}
    load_video
-diff --git a/util/grub.d/95_textmode.in b/util/grub.d/95_textmode.in
-new file mode 100644
-index 0000000..fa48cf9
+   insmod gfxterm
+Index: grub-2.04/util/grub.d/95_textmode.in
+===================================================================
 --- /dev/null
-+++ b/util/grub.d/95_textmode.in
-@@ -0,0 +1,11 @@
++++ grub-2.04/util/grub.d/95_textmode.in
+@@ -0,0 +1,12 @@
 +#!/bin/sh
 +
-+if [ -d /sys/firmware/efi ]; then
-+    echo "
-+    # On EFI systems we can only have graphics *or* serial, so allow the user
-+    # to switch between the two
-+    hiddenentry 'Text mode' --hotkey 't' {
-+	set textmode=true
-+	terminal_output console
-+    }"
++cat <<EOF
++if [ "\${grub_platform}" = "efi" ]; then
++  # On EFI systems we can only have graphics *or* serial, so allow the user
++  # to switch between the two
++  hiddenentry 'Text mode' --hotkey 't' {
++    set textmode=true
++    terminal_output console
++  }
 +fi
++EOF
diff --git a/grub2.changes b/grub2.changes
index 52d78ab..2373e8d 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 12 08:29:55 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Adjust patch to make EFI detection a runtime decision (bsc#1164385):
+  * grub2-SUSE-Add-the-t-hotkey.patch
+
 -------------------------------------------------------------------
 Fri Feb 28 16:36:57 UTC 2020 - rw@suse.com
 
diff --git a/grub2.spec b/grub2.spec
index ba088f4..41fccd4 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -153,7 +153,7 @@ Release:        0
 Summary:        Bootloader with support for Linux, Multiboot and more
 License:        GPL-3.0-or-later
 Group:          System/Boot
-Url:            http://www.gnu.org/software/grub/
+URL:            http://www.gnu.org/software/grub/
 Source0:        https://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
 Source1:        90_persistent
 Source2:        grub.default