forked from pool/grub2
8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
46 lines
1.2 KiB
Diff
46 lines
1.2 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(+)
|
|
|
|
--- a/util/grub.d/00_header.in
|
|
+++ b/util/grub.d/00_header.in
|
|
@@ -54,6 +54,33 @@
|
|
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
|