From 796a10711d5011409da0a114a26c0b1728fb4b28a4bf65209726cef92abf9817 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 23 May 2018 14:06:18 +0000 Subject: [PATCH] Accepting request 609945 from Base:System OBS-URL: https://build.opensuse.org/request/show/609945 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=184 --- grub2-s390x-10-keep-network-at-kexec.patch | 17 +++++++++++++++++ grub2.changes | 6 ++++++ grub2.spec | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 grub2-s390x-10-keep-network-at-kexec.patch diff --git a/grub2-s390x-10-keep-network-at-kexec.patch b/grub2-s390x-10-keep-network-at-kexec.patch new file mode 100644 index 0000000..e2594fb --- /dev/null +++ b/grub2-s390x-10-keep-network-at-kexec.patch @@ -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'.")); diff --git a/grub2.changes b/grub2.changes index ff70e78..cd75deb 100644 --- a/grub2.changes +++ b/grub2.changes @@ -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 diff --git a/grub2.spec b/grub2.spec index c9ef60b..8bf7f6d 100644 --- a/grub2.spec +++ b/grub2.spec @@ -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 # and/or use fallback entry if default kernel entry removed (bsc#1065349) Patch430: grub2-mkconfig-default-entry-correction.patch +Patch431: grub2-s390x-10-keep-network-at-kexec.patch # Use pkg-config to find Freetype2 Patch500: grub2-freetype-pkgconfig.patch @@ -559,6 +560,7 @@ swap partition while in resuming %patch420 -p1 %patch421 -p1 %patch430 -p1 +%patch431 -p1 %patch500 -p1 %build