56082a3f99
virt-manager-1.4.1.tar.bz2 virtinst-check-date-format.patch virtinst-no-usb-tablet-for-xenpv.patch * New VM wixard virt-bootstrap integration (Radostin Stoyanov) * New VM wizard support for virtuozzo containers (Mikhail Feoktistov) * network UI: add support to create SR-IOV VF pool (Lin Ma) * Nicer OS list in New VM wizard (Pino Toscano) * Better defaults for UEFI secureboot builds (Pavel Hrdina) * Fix defaults for aarch64 VMs if graphics are requested * virt-install: new –memdev option (Pavel Hrdina) * virt-install: add –disk logical/physical_block_size (Yuri Arabadji) * virt-install: add –features hyperv_reset=, hyperv_synic= (Venkat Datta N H) - Dropped the following patches contained in new tarball f5d709d9-lang-it-1.patch c66098f3-lang-it-2.patch 452a693e-lang-update.patch 6b5106ea-lang-it-ko-fix.patch 9c8ffe51-fix-multiple-warnings-1.patch cb182f7e-skip-authentication-only-for-VNC-with-listen-type-none.patch 0610cd6a-ensure-bool-value-used-for-set_sensitive-call.patch f341352c-remove-redundant-error-string.patch ff3b4dc5-dont-overwrite-install-bootorder.patch 2099a194-reset-guest-domain-to-none-on-domain-creation-error.patch 93085d2b-reset-guest-domain-to-none-on-domain-creation-error.patch 7aee124d-fix-multiple-warnings-2.patch f38c56c9-add-support-for-SMM-feature.patch 24f9d053-add-support-for-loader-secure-attribute.patch 4f8e795c-if-required-by-UEFI-enable-SMM-feature-and-set-q35-machine-type.patch b690908a-enable-secure-feature-together-with-smm-for-UEFI.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=356
54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
Reference: bnc#863821
|
|
grub.xen is required to boot PV VMs that use the BTRFS filesystem.
|
|
This patch forces the use of grub.xen (instead of using pygrub) for
|
|
newer suse distros like SLE12 and openSUSE 13.2.
|
|
Index: virt-manager-1.4.2/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-1.4.2.orig/virtinst/guest.py
|
|
+++ virt-manager-1.4.2/virtinst/guest.py
|
|
@@ -365,8 +365,20 @@ class Guest(XMLBuilder):
|
|
if (not install and
|
|
self.os.is_xenpv() and
|
|
not self.os.kernel):
|
|
- self.bootloader = "/usr/bin/pygrub"
|
|
- self.os.clear()
|
|
+ os_ver = self._get_os_variant()
|
|
+ if self.os.arch != 'x86_64' or os_ver.startswith("sles9") or \
|
|
+ os_ver.startswith("sles10") or os_ver.startswith("sled10") or \
|
|
+ os_ver.startswith("opensuse10") or os_ver.startswith("opensuse11"):
|
|
+ self.bootloader = "/usr/bin/pygrub"
|
|
+ self.os.clear()
|
|
+ else:
|
|
+ self.installer._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
|
|
+ self.installer._install_initrd = None
|
|
+ self.installer.extraargs = None
|
|
+ # alter_bootconfig won't update the osxml unless it thinks
|
|
+ # we are in an install phase. Add force_update param to call
|
|
+ self.installer.alter_bootconfig(self, True, True)
|
|
+ logging.info("Using grub.xen to boot guest")
|
|
|
|
return self.get_xml_config()
|
|
|
|
Index: virt-manager-1.4.2/virtinst/installer.py
|
|
===================================================================
|
|
--- virt-manager-1.4.2.orig/virtinst/installer.py
|
|
+++ virt-manager-1.4.2/virtinst/installer.py
|
|
@@ -99,7 +99,7 @@ class Installer(object):
|
|
break
|
|
return bootorder
|
|
|
|
- def alter_bootconfig(self, guest, isinstall):
|
|
+ def alter_bootconfig(self, guest, isinstall, force_update=False):
|
|
"""
|
|
Generate the portion of the guest xml that determines boot devices
|
|
and parameters. (typically the <os></os> block)
|
|
@@ -110,7 +110,7 @@ class Installer(object):
|
|
'post-install' phase.
|
|
@type isinstall: C{bool}
|
|
"""
|
|
- if isinstall and not self.has_install_phase():
|
|
+ if isinstall and not force_update and not self.has_install_phase():
|
|
return
|
|
|
|
bootorder = guest.os.bootorder
|