2014-10-29 17:03:15 +00:00
|
|
|
Index: virt-manager-1.1.0/virtinst/guest.py
|
2014-03-24 15:05:15 +00:00
|
|
|
===================================================================
|
2014-10-29 17:03:15 +00:00
|
|
|
--- virt-manager-1.1.0.orig/virtinst/guest.py
|
|
|
|
|
+++ virt-manager-1.1.0/virtinst/guest.py
|
2015-01-05 18:16:33 +00:00
|
|
|
@@ -350,8 +350,18 @@ class Guest(XMLBuilder):
|
2014-04-28 22:47:42 +00:00
|
|
|
if (not install and
|
|
|
|
|
self.os.is_xenpv() and
|
|
|
|
|
not self.os.kernel):
|
|
|
|
|
- self.bootloader = "/usr/bin/pygrub"
|
|
|
|
|
- self.os.clear()
|
2014-03-27 22:27:37 +00:00
|
|
|
+ os_ver = self._get_os_variant()
|
2015-01-05 18:16:33 +00:00
|
|
|
+ if os_ver == "sles12" or os_ver == "sled12" or os_ver == "opensuse13":
|
2014-03-27 22:27:37 +00:00
|
|
|
+ self.installer._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
|
|
|
|
|
+ self.installer._install_initrd = None
|
|
|
|
|
+ self.installer.extraargs = None
|
2014-04-28 22:47:42 +00:00
|
|
|
+ # 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)
|
2014-03-27 22:27:37 +00:00
|
|
|
+ logging.info("Using grub.xen to boot guest")
|
2014-04-28 22:47:42 +00:00
|
|
|
+ else:
|
2014-03-24 15:05:15 +00:00
|
|
|
+ self.bootloader = "/usr/bin/pygrub"
|
2014-04-28 22:47:42 +00:00
|
|
|
+ self.os.clear()
|
2014-03-24 15:05:15 +00:00
|
|
|
|
|
|
|
|
return self.get_xml_config()
|
2014-04-28 22:47:42 +00:00
|
|
|
|
2014-10-29 17:03:15 +00:00
|
|
|
Index: virt-manager-1.1.0/virtinst/installer.py
|
2014-04-28 22:47:42 +00:00
|
|
|
===================================================================
|
2014-10-29 17:03:15 +00:00
|
|
|
--- virt-manager-1.1.0.orig/virtinst/installer.py
|
|
|
|
|
+++ virt-manager-1.1.0/virtinst/installer.py
|
2014-04-28 22:47:42 +00:00
|
|
|
@@ -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)
|
