diff --git a/virt-manager.changes b/virt-manager.changes index 1af7a2e..5f9f4b1 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 8 11:47:56 MDT 2015 - carnold@suse.com + +- bsc#949566 - virt-manager: Doesn't detect openSUSE 42 correctly + virtinst-pvgrub2-bootloader.patch + ------------------------------------------------------------------- Fri Sep 25 15:24:23 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index e4b1da6..203bed6 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,7 +1,7 @@ # # spec file for package virt-manager # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" diff --git a/virtinst-pvgrub2-bootloader.patch b/virtinst-pvgrub2-bootloader.patch index 74cb5be..6a7121c 100644 --- a/virtinst-pvgrub2-bootloader.patch +++ b/virtinst-pvgrub2-bootloader.patch @@ -13,8 +13,8 @@ Index: virt-manager-1.2.1/virtinst/guest.py - self.bootloader = "/usr/bin/pygrub" - self.os.clear() + os_ver = self._get_os_variant() -+ if os_ver == "sles12" or os_ver == "sled12" or \ -+ os_ver == "opensuse13" or os_ver == "opensuse42": ++ if os_ver.startswith("sles12") or os_ver.startswith("sled12") or \ ++ os_ver.startswith("opensuse13") or os_ver.startswith("opensuse42"): + self.installer._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen" + self.installer._install_initrd = None + self.installer.extraargs = None