47ffb48dd8
virt-manager-1.1.0.tar.bz2 * Switch to libosinfo as OS metadata database (Giuseppe Scrivano) * Use libosinfo for OS detection from CDROM media labels (Giuseppe Scrivano) * Use libosinfo for improved OS defaults, like recommended disk size (Giuseppe Scrivano) * virt-image tool has been removed, as previously announced * Enable Hyper-V enlightenments for Windows VMs * Revert virtio-console default, back to plain serial console * Experimental q35 option in new VM ‘customize’ dialog * UI for virtual network QoS settings (Giuseppe Scrivano) * virt-install: –disk discard= support (Jim Minter) * addhardware: Add spiceport UI (Marc-André Lureau) * virt-install: –events on_poweroff etc. support (Chen Hanxiao) * cli –network portgroup= support and UI support * cli –boot initargs= and UI support * addhardware: allow setting controller model (Chen Hanxiao) * virt-install: support setting hugepage options (Chen Hanxiao) - Drop upstream patches and old tarball virt-manager-1.0.1.tar.bz2 5332ee4d-enable-media-detection-for-ISO-images.patch 53341e7e-hide-hardware-removal-for-non-devices.patch 53342f31-set-right-ip-address-for-ipv6.patch 53375bad-raise-value-error-when-no-ipaddr-set.patch 53388de2-show-port-number-for-active-autoport-VM.patch 53397ae0-check-ip-address-format.patch 53399b45-hook-into-domain-balloon-event.patch 533d708d-fix-showing-vcpus-values.patch 533d7602-fix-changing-graphics-type.patch 533d7be7-clarify-iscsi-IQN-fields.patch 5345682c-addstorage-remove-whitespace-for-storage-path.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=207
48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
Index: virt-manager-1.1.0/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-1.1.0.orig/virtinst/guest.py
|
|
+++ virt-manager-1.1.0/virtinst/guest.py
|
|
@@ -353,8 +353,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.1.0/virtinst/installer.py
|
|
===================================================================
|
|
--- virt-manager-1.1.0.orig/virtinst/installer.py
|
|
+++ virt-manager-1.1.0/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)
|