c85662cbfa
- Merge changes from SLE12
- add grub2-emu-4-all.patch
* Build 'grub2-emu' wherever possible, to allow a better
implementation of that feature.
- add grub2-s390x-06-loadparm.patch,
- add grub2-commands-introduce-read_file-subcommand.patch:
* allow s390x to telecontrol grub2. (bsc#891946, bsc#892852)
- add grub2-s390x-06-loadparm.patch:
* ignore case and fix transliteration of parameter. (bsc#891946)
- add grub2-s390x-07-add-image-param-for-zipl-setup.patch
* Add --image switch to force zipl update to specific kernel
(bsc#928131)
- add grub2-s390x-08-workaround-part-to-disk.patch
* Ignore partition tables on s390x. (bsc#935127)
- add grub2-efi-chainload-harder.patch:
* allow XEN to be chain-loaded despite firmware flaws. (bnc#887793)
* Do not use shim lock protocol for reading pe header, it won't be
available when secure boot disabled (bsc#943380)
* Make firmware flaw condition be more precisely detected and add
debug message for the case
* Check msdos header to find PE file header (bsc#954126)
- grub2-s390x-04-grub2-install.patch:
* streamline boot to grub menu. (bsc#898198)
* Force '/usr' to read-only before calling kexec. (bsc#932951)
- grub2-once:
* add '--enum' option to enumerate boot-entries in a way
actually understood by 'grub2'. (bsc#892852, bsc#892811)
* Examine variables from grub environment in 'grub2-once'. (fate#319632)
OBS-URL: https://build.opensuse.org/request/show/457610
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=254
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From: Raymund Will <rw@suse.com>
|
|
Subject: Allow s390x-emu to telecontrolled by LOADPARM
|
|
References: bsc#892852, bsc#891946
|
|
Patch-Mainline: no
|
|
|
|
---
|
|
util/grub.d/00_header.in | 27 +++++++++++++++++++++++++++
|
|
1 file changed, 27 insertions(+)
|
|
|
|
Index: grub-2.02~beta3/util/grub.d/00_header.in
|
|
===================================================================
|
|
--- grub-2.02~beta3.orig/util/grub.d/00_header.in
|
|
+++ grub-2.02~beta3/util/grub.d/00_header.in
|
|
@@ -52,6 +52,33 @@ if [ "\${env_block}" ] ; then
|
|
fi
|
|
|
|
EOF
|
|
+if [ "`uname -m`" = "s390x" ]; then
|
|
+ cat <<EOF
|
|
+if [ ! "\$sys_loadparm" ]; then
|
|
+ set sys_loadparm=/sys/firmware/ipl/loadparm
|
|
+fi
|
|
+while [ -f "\$sys_loadparm" ]; do
|
|
+ unset loadparm
|
|
+ read_file "\$sys_loadparm" loadparm
|
|
+ if [ ! "\${loadparm}" ]; then break; fi
|
|
+ unset z_gp # extract grub part
|
|
+ regexp -s 2:z_gp '^([^Gg]*)[Gg](.+)$' "\$loadparm"
|
|
+ if [ ! "\$z_gp" ]; then break; fi
|
|
+ while true; do
|
|
+ unset z_1
|
|
+ unset z_2 # remap zIPL-compatible "." to grub's '>'
|
|
+ regexp -s 1:z_1 -s 2:z_2 '^([0-9][0-9>]*)\.([0-9][0-9.]*)$' "\$z_gp"
|
|
+ if [ ! "\$z_1" -o ! "\$z_2" ]; then break; fi
|
|
+ set z_gp="\$z_1>\$z_2"
|
|
+ done
|
|
+ if [ ! "\$z_gp" ]; then break; fi
|
|
+ set next_entry="\$z_gp"
|
|
+ unset z_gp
|
|
+ unset loadparm
|
|
+ break
|
|
+done
|
|
+EOF
|
|
+fi
|
|
if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
|
|
cat <<EOF
|
|
if cmostest $GRUB_BUTTON_CMOS_ADDRESS ; then
|