From 96e525ab04695bd3b301f5225477669fd58d8ba8 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Fri, 6 Jan 2017 22:04:32 +0000 Subject: [PATCH] - bsc#1018645 - virt-manager is using pygrub for booting PV domU 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 --- virt-manager.changes | 8 +++++++- virt-manager.spec | 2 +- virtinst-pvgrub2-bootloader.patch | 12 ++++++------ virtinst-set-cache-mode-unsafe-for-install.patch | 4 ++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/virt-manager.changes b/virt-manager.changes index 73e79576..2e6550eb 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -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 @@ -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 -- fate#319621 - KVM: Provide SMBIOS info to KVM virtual machines +- fate##319621 - KVM: Provide SMBIOS info to KVM virtual machines d8a0a788-xmlbuilder-01.patch 559e813b-xmlbuilder-02.patch a931a1a6-xmlbuilder-03.patch diff --git a/virt-manager.spec b/virt-manager.spec index 5c8c5264..4aebe234 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed diff --git a/virtinst-pvgrub2-bootloader.patch b/virtinst-pvgrub2-bootloader.patch index dcd21520..7058940b 100644 --- a/virtinst-pvgrub2-bootloader.patch +++ b/virtinst-pvgrub2-bootloader.patch @@ -13,9 +13,12 @@ Index: virt-manager-1.4.0/virtinst/guest.py - 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") or \ -+ os_ver.startswith("opensuse-tumbleweed"): ++ if os_ver.startswith("sles9") or \ ++ os_ver.startswith("sles10") or os_ver.startswith("sled10") or \ ++ 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_initrd = 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 + 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() diff --git a/virtinst-set-cache-mode-unsafe-for-install.patch b/virtinst-set-cache-mode-unsafe-for-install.patch index ea2ebb55..e83e8336 100644 --- a/virtinst-set-cache-mode-unsafe-for-install.patch +++ b/virtinst-set-cache-mode-unsafe-for-install.patch @@ -23,8 +23,8 @@ Index: virt-manager-1.4.0/virtinst/guest.py if (not install and self.os.is_xenpv() and @@ -379,7 +390,10 @@ class Guest(XMLBuilder): - self.bootloader = "/usr/bin/pygrub" - self.os.clear() + self.installer.alter_bootconfig(self, True, True) + logging.info("Using grub.xen to boot guest") - return self.get_xml_config() + xml_config = self.get_xml_config()