| |
@@ -0,0 +1,62 @@
|
| |
+ From 496e3469481ea95513d826c1ea5c8ad9012e05f5 Mon Sep 17 00:00:00 2001
|
| |
+ From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
| |
+ Date: Mon, 28 Aug 2017 13:51:14 -0400
|
| |
+ Subject: [PATCH 1/2] Fix util/grub.d/20_linux_xen.in: Add xen_boot command
|
| |
+ support for aarch64
|
| |
+
|
| |
+ Commit d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe introduced
|
| |
+ the support for this, but it does not work under x86 (as it stops
|
| |
+ 20_linux_xen from running).
|
| |
+
|
| |
+ The 20_linux_xen is run under a shell and any exits from within it:
|
| |
+
|
| |
+ (For example on x86):
|
| |
+ + /usr/bin/grub2-file --is-arm64-efi /boot/xen-4.9.0.gz
|
| |
+ [root@tst063 grub]# echo $?
|
| |
+ 1
|
| |
+
|
| |
+ will result in 20_linux_xen exciting without continuing
|
| |
+ and also causing grub2-mkconfig to stop processing.
|
| |
+
|
| |
+ As in:
|
| |
+
|
| |
+ [root@tst063 ~]#
|
| |
+
|
| |
+ And no more.
|
| |
+
|
| |
+ This patch wraps the invocation of grub-file to be a in subshell
|
| |
+ and to process the return value in a conditional. That fixes
|
| |
+ the issue.
|
| |
+
|
| |
+ RH-BZ 1486002: grub2-mkconfig does not work if xen.gz is installed.
|
| |
+ CC: Fu Wei <fu.wei@linaro.org>
|
| |
+ Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
| |
+ ---
|
| |
+ util/grub.d/20_linux_xen.in | 9 ++++-----
|
| |
+ 1 file changed, 4 insertions(+), 5 deletions(-)
|
| |
+
|
| |
+ diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
|
| |
+ index c002fc9..083bcef 100644
|
| |
+ --- a/util/grub.d/20_linux_xen.in
|
| |
+ +++ b/util/grub.d/20_linux_xen.in
|
| |
+ @@ -206,13 +206,12 @@ while [ "x${xen_list}" != "x" ] ; do
|
| |
+ if [ "x$is_top_level" != xtrue ]; then
|
| |
+ echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
|
| |
+ fi
|
| |
+ - $grub_file --is-arm64-efi $current_xen
|
| |
+ - if [ $? -ne 0 ]; then
|
| |
+ - xen_loader="multiboot"
|
| |
+ - module_loader="module"
|
| |
+ - else
|
| |
+ + if ($grub_file --is-arm64-efi $current_xen); then
|
| |
+ xen_loader="xen_hypervisor"
|
| |
+ module_loader="xen_module"
|
| |
+ + else
|
| |
+ + xen_loader="multiboot"
|
| |
+ + module_loader="module"
|
| |
+ fi
|
| |
+ while [ "x$list" != "x" ] ; do
|
| |
+ linux=`version_find_latest $list`
|
| |
+ --
|
| |
+ 2.1.4
|
| |
+
|
| |
konradr
commented 6 years ago
Two bugs in one:
- The recent ARM work on detecting if the payload is multiboot2 or not
would cause the 20_linux shell script to exit (prematurily) instead
of returning 0 or 1 on x86. Hence on x86 we would never include xen.gz
anymore.
- Added also support to detect multiboot2 to use that (which can do
EFI handoff).
Fixes rhbz#1486002
Signed-off-by: Konrad Rzeszutek Wilk konrad@kernel.org