From cc21dc861d280dcc71f2838b5fbf70a8ba717f28 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Fri, 22 Nov 2019 20:56:15 +0000 Subject: [PATCH] - bsc#1157097 - PV guest on_reboot event be set to 'destroy' by default virtinst-pvgrub2-bootloader.patch - Rebased patches virtinst-change-location-for-grub_xen.patch virtman-increase-setKeepAlive-count.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=490 --- virt-manager.changes | 10 ++++++++++ virtinst-change-location-for-grub_xen.patch | 2 +- virtinst-pvgrub2-bootloader.patch | 4 +++- virtman-increase-setKeepAlive-count.patch | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/virt-manager.changes b/virt-manager.changes index 46fa02bc..cba1c84b 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Nov 22 13:50:11 MST 2019 - carnold@suse.com + +- bsc#1157097 - PV guest on_reboot event be set to 'destroy' by + default + virtinst-pvgrub2-bootloader.patch +- Rebased patches + virtinst-change-location-for-grub_xen.patch + virtman-increase-setKeepAlive-count.patch + ------------------------------------------------------------------- Tue Nov 12 10:17:56 MST 2019 - carnold@suse.com diff --git a/virtinst-change-location-for-grub_xen.patch b/virtinst-change-location-for-grub_xen.patch index 023efefc..125009f3 100644 --- a/virtinst-change-location-for-grub_xen.patch +++ b/virtinst-change-location-for-grub_xen.patch @@ -14,8 +14,8 @@ Index: virt-manager-2.2.1/virtinst/install/installer.py + else: + self._treemedia_bootconfig = ("/usr/lib/grub2/x86_64-xen/grub.xen", "", "") log.debug("Using grub.xen to boot guest") + on_reboot_value = guest.on_reboot self._alter_bootconfig(guest) - final_xml = guest.get_xml() Index: virt-manager-2.2.1/virtManager/delete.py =================================================================== --- virt-manager-2.2.1.orig/virtManager/delete.py diff --git a/virtinst-pvgrub2-bootloader.patch b/virtinst-pvgrub2-bootloader.patch index 213d0335..1baa822d 100644 --- a/virtinst-pvgrub2-bootloader.patch +++ b/virtinst-pvgrub2-bootloader.patch @@ -6,7 +6,7 @@ Index: virt-manager-2.2.1/virtinst/install/installer.py =================================================================== --- virt-manager-2.2.1.orig/virtinst/install/installer.py +++ virt-manager-2.2.1/virtinst/install/installer.py -@@ -436,6 +436,18 @@ class Installer(object): +@@ -436,6 +436,20 @@ class Installer(object): install_xml = None if self.has_install_phase(): install_xml = self._get_install_xml(guest, meter) @@ -21,7 +21,9 @@ Index: virt-manager-2.2.1/virtinst/install/installer.py + guest.bootloader = None + self._treemedia_bootconfig = ("/usr/lib/grub2/x86_64-xen/grub.xen", "", "") + log.debug("Using grub.xen to boot guest") ++ on_reboot_value = guest.on_reboot + self._alter_bootconfig(guest) ++ guest.on_reboot = on_reboot_value final_xml = guest.get_xml() log.debug("Generated install XML: %s", diff --git a/virtman-increase-setKeepAlive-count.patch b/virtman-increase-setKeepAlive-count.patch index 25581e64..7dd6cf7e 100644 --- a/virtman-increase-setKeepAlive-count.patch +++ b/virtman-increase-setKeepAlive-count.patch @@ -6,7 +6,7 @@ Index: virt-manager-2.2.1/virtManager/connection.py =================================================================== --- virt-manager-2.2.1.orig/virtManager/connection.py +++ virt-manager-2.2.1/virtManager/connection.py -@@ -1002,7 +1002,7 @@ class vmmConnection(vmmGObject): +@@ -995,7 +995,7 @@ class vmmConnection(vmmGObject): self._add_conn_events() try: