pool/virt-manager
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bsc#1018645 - virt-manager is using pygrub for booting PV domU

Browse Source 
virtinst-pvgrub2-bootloader.patch
- fate##319621 - KVM: Provide SMBIOS info to KVM virtual machines

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=334
This commit is contained in:
Charles Arnold 2017-01-06 22:04:32 +00:00 committed by Git OBS Bridge
parent fb2eef8fdf
commit 96e525ab04
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
virt-manager.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 6 15:54:59 MST 2017 - carnold@suse.com
- bsc#1018645 - virt-manager is using pygrub for booting PV domU
virtinst-pvgrub2-bootloader.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 8 13:50:49 MDT 2016 - carnold@suse.com Thu Sep 8 13:50:49 MDT 2016 - carnold@suse.com
@ -9,7 +15,7 @@ Thu Sep 8 13:50:49 MDT 2016 - carnold@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 8 10:03:24 MDT 2016 - carnold@suse.com Thu Sep 8 10:03:24 MDT 2016 - carnold@suse.com
- fate#319621 - KVM: Provide SMBIOS info to KVM virtual machines - fate##319621 - KVM: Provide SMBIOS info to KVM virtual machines
d8a0a788-xmlbuilder-01.patch d8a0a788-xmlbuilder-01.patch
559e813b-xmlbuilder-02.patch 559e813b-xmlbuilder-02.patch
a931a1a6-xmlbuilder-03.patch a931a1a6-xmlbuilder-03.patch

2
virt-manager.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package virt-manager # spec file for package virt-manager
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

12
virtinst-pvgrub2-bootloader.patch
View File

@ -13,9 +13,12 @@ Index: virt-manager-1.4.0/virtinst/guest.py
- self.bootloader = "/usr/bin/pygrub" - self.bootloader = "/usr/bin/pygrub"
- self.os.clear() - self.os.clear()
+ os_ver = self._get_os_variant() + os_ver = self._get_os_variant()
+ if os_ver.startswith("sles12") or os_ver.startswith("sled12") or \ + if os_ver.startswith("sles9") or \
+ os_ver.startswith("opensuse13") or os_ver.startswith("opensuse42") or \ + os_ver.startswith("sles10") or os_ver.startswith("sled10") or \
+ os_ver.startswith("opensuse-tumbleweed"): + 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_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
+ self.installer._install_initrd = None + self.installer._install_initrd = None
+ self.installer.extraargs = None + self.installer.extraargs = None
@ -23,9 +26,6 @@ Index: virt-manager-1.4.0/virtinst/guest.py
+ # we are in an install phase. Add force_update param to call + # we are in an install phase. Add force_update param to call
+ self.installer.alter_bootconfig(self, True, True) + self.installer.alter_bootconfig(self, True, True)
+ logging.info("Using grub.xen to boot guest") + logging.info("Using grub.xen to boot guest")
+ else:
+ self.bootloader = "/usr/bin/pygrub"
+ self.os.clear()
return self.get_xml_config() return self.get_xml_config()

4
virtinst-set-cache-mode-unsafe-for-install.patch
View File

@ -23,8 +23,8 @@ Index: virt-manager-1.4.0/virtinst/guest.py
if (not install and if (not install and
self.os.is_xenpv() and self.os.is_xenpv() and
@@ -379,7 +390,10 @@ class Guest(XMLBuilder): @@ -379,7 +390,10 @@ class Guest(XMLBuilder):
self.bootloader = "/usr/bin/pygrub" self.installer.alter_bootconfig(self, True, True)
self.os.clear() logging.info("Using grub.xen to boot guest")
- return self.get_xml_config() - return self.get_xml_config()
+ xml_config = self.get_xml_config() + xml_config = self.get_xml_config()