[Xen-devel] [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
Signed-off-by: Konrad Rzeszutek Wilk
---
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
___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 1/2] Fix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64
On Mon, Aug 28, 2017 at 02:40:14PM -0400, Konrad Rzeszutek Wilk wrote:
> 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:
git format-patch decided to eat this relevant part:
[root@tst063 grub]# ./grub-mkconfig | tail
Generating grub configuration file ...
Found linux image: /boot/vmlinuz-4.13.0-0.rc5.git1.1.fc27.x86_64
Found initrd image: /boot/initramfs-4.13.0-0.rc5.git1.1.fc27.x86_64.img
Found linux image: /boot/vmlinuz-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2
Found initrd image:
/boot/initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2.img
echo'Loading Linux
0-rescue-ec082ee24aea41b9b16aca52a6d10cc2 ...'
linux /vmlinuz-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2
root=/dev/mapper/fedora_tst063-root ro single
echo'Loading initial ramdisk ...'
initrd /initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2.img
}
}
### END /usr/local/etc/grub.d/10_linux ###
### BEGIN /usr/local/etc/grub.d/20_linux_xen ###
root@tst063 grub]#
>
> [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
> Signed-off-by: Konrad Rzeszutek Wilk
> ---
> 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
>
___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 1/2] Fix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64
Hi Konrad,
Thanks for your feedback.
On 29 August 2017 at 02:40, Konrad Rzeszutek Wilk
wrote:
> 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 your example
> (For example on x86):
> + /usr/bin/grub2-file --is-arm64-efi /boot/xen-4.9.0.gz
> [root@tst063 grub]# echo $?
> 1
I guess that is right behavior, then
xen_loader="multiboot"
module_loader="module"
/boot/xen-4.9.0.gz is a xen binary for x86, right?
>
> will result in 20_linux_xen exciting without continuing
> and also causing grub2-mkconfig to stop processing.
maybe we are using different shell? are you using ash?
>
> 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
> Signed-off-by: Konrad Rzeszutek Wilk
> ---
> 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
>
--
Best regards,
Fu Wei
Software Engineer
Red Hat
___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 1/2] Fix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64
On Tue, Aug 29, 2017 at 03:12:59PM +0800, Fu Wei Fu wrote:
> Hi Konrad,
>
> Thanks for your feedback.
Thank you for speedy response!
>
> On 29 August 2017 at 02:40, Konrad Rzeszutek Wilk
> wrote:
> > 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 your example
>
> > (For example on x86):
> > + /usr/bin/grub2-file --is-arm64-efi /boot/xen-4.9.0.gz
> > [root@tst063 grub]# echo $?
> > 1
>
> I guess that is right behavior, then
> xen_loader="multiboot"
>module_loader="module"
>
> /boot/xen-4.9.0.gz is a xen binary for x86, right?
Correct. I also tested it with an xen.efi which was built for ARM (I copied
it in /boot/ directroy), and it created an proper entry for it:
xen_hypervisor /xen.efi placeholder dom0_max_vcpus=2 dom0_mem=max:2G
loglvl=all guest_loglvl=all console=com1 com1=115200,8n1 iommu=verbose,debug
scan=ucode conring_size=2097152 ${xen_rm_opts}
en_module /vmlinuz-4.13.0-0.rc5.git1.1.fc27.x86_64 placeholder
root=/dev/mapper/fedora_tst063-root ro rd.lvm.lv=fedora_tst063/root
rd.lvm.lv=fedora_tst063/swap loglevel=8 console=hvc0
...
Naturally I didn't try to boot it as it would most surely not work.
>
> >
> > will result in 20_linux_xen exciting without continuing
> > and also causing grub2-mkconfig to stop processing.
>
> maybe we are using different shell? are you using ash?
[root@tst063 fedora]# head -2 `which grub2-mkconfig`
#! /bin/sh
set -e
And the upstream grub shows:
[root@tst063 grub]# head -2 ./util/grub-mkconfig.in
#! /bin/sh
set -e
I am assuming you are using ARM, in which case I would recommend you
just copy xen.gz (compiled for x86) in your /boot directory. You should
get a similar failure condition as I got.
>
> >
> > 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
> > Signed-off-by: Konrad Rzeszutek Wilk
> > ---
> > 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
> >
>
>
>
> --
> Best regards,
>
> Fu Wei
> Software Engineer
> Red Hat
___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 1/2] Fix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64
On Mon, Aug 28, 2017 at 02:42:18PM -0400, Konrad Rzeszutek Wilk wrote: > On Mon, Aug 28, 2017 at 02:40:14PM -0400, Konrad Rzeszutek Wilk wrote: > > 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 s/exciting/exiting/? > > and also causing grub2-mkconfig to stop processing. > > > > As in: > > git format-patch decided to eat this relevant part: > > [root@tst063 grub]# ./grub-mkconfig | tail > Generating grub configuration file ... > Found linux image: /boot/vmlinuz-4.13.0-0.rc5.git1.1.fc27.x86_64 > Found initrd image: /boot/initramfs-4.13.0-0.rc5.git1.1.fc27.x86_64.img > Found linux image: /boot/vmlinuz-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2 > Found initrd image: > /boot/initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2.img > echo'Loading Linux > 0-rescue-ec082ee24aea41b9b16aca52a6d10cc2 ...' > linux /vmlinuz-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2 > root=/dev/mapper/fedora_tst063-root ro single > echo'Loading initial ramdisk ...' > initrd /initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2.img > } > } > > ### END /usr/local/etc/grub.d/10_linux ### > > ### BEGIN /usr/local/etc/grub.d/20_linux_xen ### > > root@tst063 grub]# In general LGTM. Though please repost this patch with full commit message? Daniel ___ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
