a18ef09a88
virtinst-add-default-rng-device.patch - Fix GUI failure to display addition of a second disk Dropped virtman-device-flags.patch - bnc#885380 - virt-install: by default generates raw format against various virtual disk formats virtinst-supported-disk-formats.patch virtman-supported-disk-formats.patch - Dropped virtinst-qed.patch, virtman-qed.patch - bnc#869026 - Build0198: Unable to complete install: 'XML error: No PCI buses available' virtman-add-s390x-arch-support.patch - Upstream bug fixes 53ac1f8d-createnet-validate-last-page-before-creating-network.patch 53ac1f8d-fix-show_err-typo.patch 53b39a13-dont-create-disk-images-world-readable-executable.patch 53b409bc-add-keep-alive-method-and-connection-check.patch 53b409bd-console-prevent-access-to-deleted-objects.patch 53b728c6-report-error-during-connection-bring-up.patch 53b728c6-connection-handle-unsupported-KeepAlive.patch 53bb1995-network-refresh-XML-definition-on-state-update.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=188
48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
Index: virt-manager-1.0.1/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-1.0.1.orig/virtinst/guest.py
|
|
+++ virt-manager-1.0.1/virtinst/guest.py
|
|
@@ -351,8 +351,18 @@ 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 == "sles12" or os_ver == "sled12":
|
|
+ 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, self.os, 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.0.1/virtinst/installer.py
|
|
===================================================================
|
|
--- virt-manager-1.0.1.orig/virtinst/installer.py
|
|
+++ virt-manager-1.0.1/virtinst/installer.py
|
|
@@ -111,7 +111,7 @@ class Installer(object):
|
|
dev.validate()
|
|
return dev
|
|
|
|
- def alter_bootconfig(self, guest, isinstall, bootconfig):
|
|
+ def alter_bootconfig(self, guest, isinstall, bootconfig, force_update=False):
|
|
"""
|
|
Generate the portion of the guest xml that determines boot devices
|
|
and parameters. (typically the <os></os> block)
|
|
@@ -122,7 +122,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)
|