rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 609125 from home:tsaupe:branches:Base:System

Browse Source 
grub2-emu on s390 keep network during kexec boot (bsc#1089493)

OBS-URL: https://build.opensuse.org/request/show/609125
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=301
This commit is contained in:
Michael Chang 2018-05-17 03:00:56 +00:00 committed by Git OBS Bridge
parent baa0327672
commit d3ba93671b
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
grub2-s390x-10-keep-network-at-kexec.patch Normal file
View File

@ -0,0 +1,17 @@
Index: grub-2.02/grub-core/loader/emu/linux.c
===================================================================
--- grub-2.02.orig/grub-core/loader/emu/linux.c
+++ grub-2.02/grub-core/loader/emu/linux.c
@@ -76,9 +76,10 @@ grub_linux_boot (void)
grub_fatal (N_("Error trying to perform 'systemctl kexec'"));
/* need to check read-only root before resetting hard!? */
- grub_printf("Performing 'kexec -e'");
+ grub_printf("Performing 'kexec -e -x'");
kexec[1] = "-e";
- kexec[2] = NULL;
+ kexec[2] = "-x";
+ kexec[3] = NULL;
rc = grub_util_exec(kexec);
if ( rc != GRUB_ERR_NONE )
grub_fatal (N_("Error trying to directly perform 'kexec -e'."));

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 16 09:07:08 UTC 2018 - Thomas.Blume@suse.com
- grub2-emu on s390 keep network during kexec boot (bsc#1089493)
* grub2-s390x-10-keep-network-at-kexec.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 4 08:07:09 UTC 2018 - idonmez@suse.com Fri May 4 08:07:09 UTC 2018 - idonmez@suse.com

2
grub2.spec
View File

@ -285,6 +285,7 @@ Patch421: 0002-AUDIT-0-http-boot-tracker-bug.patch
# check if default entry need to be corrected for updated distributor version # check if default entry need to be corrected for updated distributor version
# and/or use fallback entry if default kernel entry removed (bsc#1065349) # and/or use fallback entry if default kernel entry removed (bsc#1065349)
Patch430: grub2-mkconfig-default-entry-correction.patch Patch430: grub2-mkconfig-default-entry-correction.patch
Patch431: grub2-s390x-10-keep-network-at-kexec.patch
# Use pkg-config to find Freetype2 # Use pkg-config to find Freetype2
Patch500: grub2-freetype-pkgconfig.patch Patch500: grub2-freetype-pkgconfig.patch
@ -559,6 +560,7 @@ swap partition while in resuming
%patch420 -p1 %patch420 -p1
%patch421 -p1 %patch421 -p1
%patch430 -p1 %patch430 -p1
%patch431 -p1
%patch500 -p1 %patch500 -p1
%build %build