From 72aeea6cea9ec7d136976e883692ef9e15930e80 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 12 Feb 2019 23:00:26 +0000 Subject: [PATCH] Bootloader was being assigned incorrectly OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=458 --- virtinst-change-location-for-grub_xen.patch | 4 ++-- virtinst-pvgrub2-bootloader.patch | 4 ++-- virtman-python2-to-python3-conversion.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/virtinst-change-location-for-grub_xen.patch b/virtinst-change-location-for-grub_xen.patch index a8b82869..41cc8394 100644 --- a/virtinst-change-location-for-grub_xen.patch +++ b/virtinst-change-location-for-grub_xen.patch @@ -5,9 +5,9 @@ Index: virt-manager-2.1.0/virtinst/installer.py --- virt-manager-2.1.0.orig/virtinst/installer.py +++ virt-manager-2.1.0/virtinst/installer.py @@ -312,7 +312,10 @@ class Installer(object): - guest.os.bootloader = "pygrub" + guest.bootloader = "pygrub" else: - guest.os.bootloader = None + guest.bootloader = None - self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen" + if os.path.exists("/usr/share/grub2/x86_64-xen/grub.xen"): + self._install_kernel = "/usr/share/grub2/x86_64-xen/grub.xen" diff --git a/virtinst-pvgrub2-bootloader.patch b/virtinst-pvgrub2-bootloader.patch index 116d4e0b..a8a41bc2 100644 --- a/virtinst-pvgrub2-bootloader.patch +++ b/virtinst-pvgrub2-bootloader.patch @@ -16,9 +16,9 @@ Index: virt-manager-2.1.0/virtinst/installer.py + if guest.os.arch != 'x86_64' or os_ver.startswith("sles9") or \ + os_ver.startswith("sles10") or os_ver.startswith("sled10") or \ + os_ver.startswith("opensuse10") or os_ver.startswith("opensuse11"): -+ guest.os.bootloader = "pygrub" ++ guest.bootloader = "pygrub" + else: -+ guest.os.bootloader = None ++ guest.bootloader = None + self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen" + self._install_initrd = None + self.extraargs = None diff --git a/virtman-python2-to-python3-conversion.patch b/virtman-python2-to-python3-conversion.patch index cb093f46..9df3ed37 100644 --- a/virtman-python2-to-python3-conversion.patch +++ b/virtman-python2-to-python3-conversion.patch @@ -63,7 +63,7 @@ Index: virt-manager-2.1.0/virtManager/addhardware.py def _build_combo(combo, values, default_value=None, sort=True): -@@ -890,7 +890,7 @@ class vmmAddHardware(vmmGObjectUI): +@@ -889,7 +889,7 @@ class vmmAddHardware(vmmGObjectUI): self._dev = DeviceTpm(self.conn.get_backend()) self._dev.type = devtype