https://bugzilla.novell.com/show_bug.cgi?id=859361 https://bugzilla.novell.com/show_bug.cgi?id=859361#c6 --- Comment #6 from Michael Chang <mchang@suse.com> 2014-02-07 10:09:29 UTC --- (In reply to comment #5)
10_linux makes the assumption that every vmlinu* can be booted "native". Thats certainly not true for our kernels. No idea if upstream can have a xen-only kernel. Lets assume it does not provide that feature.
It looks like a missing feature from upstream to me as well.
xenlinux seems to be PARAVIRT=n and XEN=y pvops seems to be PARAVIRT=y and XEN=y native seems to be PARAVIRT=y|n and XEN=y|n
and in case of xenlinux/pvops, the code should check if it runs in dom0 or domU.
Ok. And I found the regression is because grub2-fix-menu-in-xen-host-server.patch dropped the patch to 10_linux.in that fixed the problem in openSUSE while upgrading to upstream 2.02-beta2. It is a turnover and not intended. But I think we can make it better now by using kernel config rather than kernel flavor in file name. diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index e7a180e..a02bf17 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -150,15 +150,23 @@ EOF EOF } +# bnc#757895 - Grub2 menu items incorrect when "Xen Virtual Machines Host Server" selected +# check kernel's flavor to prevent xen kernel from booting natively without hypervisor +is_not_xen () +{ + flavor=`echo $1 | sed -e "s,.*-,,g"` + test "x$flavor" != xxen +} + machine=`uname -m` case "x$machine" in xi?86 | xx86_64) list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + if grub_file_is_not_garbage "$i" && is_not_xen "$i" ; then echo -n "$i " ; fi done` ;; *) list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + if grub_file_is_not_garbage "$i" && is_not_xen "$i" ; then echo -n "$i " ; fi done` ;; esa
In domU no /boot/xen.gz is required. I think 20_linux_xen can be skipped if running in domU.
Ok. -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.