6bbd8f8c21
virt-manager-1.3.0.tar.bz2 * Git hosting moved to http://github.com/virt-manager/virt-manager * Switch translation infrastructure from transifex to fedora.zanata.org * Add dogtail UI tests and infrastructure * Improved support for s390x kvm (Kevin Zhao) * virt-install and virt-manager now remove created disk images if VM install startup fails * Replace urlgrabber usage with requests and urllib2 * virt-install: add –network virtualport support for openvswitch (Daniel P. Berrange) * virt-install: support multiple –security labels * virt-install: support –features kvm_hidden=on|off (Pavel Hrdina) * virt-install: add –features pmu=on|off * virt-install: add –features pvspinlock=on|off (Abhijeet Kasurde) * virt-install: add –events on_lockfailure=on|off (Abhijeet Kasurde) * virt-install: add –network link_state=up|down * virt-install: add –vcpu placement=static|auto - Dropped virt-manager-1.2.1.tar.bz2 34db1af7-fix-adding-iscsi-pools.patch 360fe110-add-s390x-arch-support.patch 4970615f-fix-qemu-vs-lxc-detection.patch 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch 601a82cb-fix-console_type-if-xen.patch 76bad650-fix-virt-xml-define-and-update.patch 77423e7a-connection-catch-more-errors-in-filter_nodedevs.patch 8dbe96fc-add-s390x-arch-support.patch a9b303fb-fix-copy-host-cpu-definition.patch aebebbf8-report-an-error-for-pxe-install-without-network.patch cde2f0ef-Suppress-gi-warnings-about-lack-of-require_version.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=283
53 lines
2.3 KiB
Diff
53 lines
2.3 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.3.0/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-1.3.0.orig/virtinst/guest.py
|
|
+++ virt-manager-1.3.0/virtinst/guest.py
|
|
@@ -365,8 +365,19 @@ 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 os_ver.startswith("sles12") or os_ver.startswith("sled12") or \
|
|
+ os_ver.startswith("opensuse13") or os_ver.startswith("opensuse42"):
|
|
+ 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")
|
|
+ else:
|
|
+ self.bootloader = "/usr/bin/pygrub"
|
|
+ self.os.clear()
|
|
|
|
return self.get_xml_config()
|
|
|
|
Index: virt-manager-1.3.0/virtinst/installer.py
|
|
===================================================================
|
|
--- virt-manager-1.3.0.orig/virtinst/installer.py
|
|
+++ virt-manager-1.3.0/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 = self._build_boot_order(isinstall, guest)
|