- bsc#1143315 - virt-manager: Fix detection for SLE15

virtinst-add-sle15-detection-support.patch
  virtinst-add-caasp-support.patch
  virtinst-detect-oes-distros.patch
  virtinst-add-pvh-support.patch
  virtinst-s390x-disable-graphics.patch
  virtinst-set-qemu-emulator.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=480

virt-manager.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul 29 13:22:56 MDT 2019 - carnold@suse.com
+
+- bsc#1143315 - virt-manager: Fix detection for SLE15
+  virtinst-add-sle15-detection-support.patch
+  virtinst-add-caasp-support.patch
+  virtinst-detect-oes-distros.patch
+  virtinst-add-pvh-support.patch
+  virtinst-s390x-disable-graphics.patch
+  virtinst-set-qemu-emulator.patch
+
 -------------------------------------------------------------------
 Wed Jul 10 14:21:53 MDT 2019 - carnold@suse.com
 

virt-manager.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 

virtinst-add-caasp-support.patch

@@ -1,9 +1,9 @@
 References: bsc#1010060
 
-Index: virt-manager-2.2.0/virtinst/install/urldetect.py
+Index: virt-manager-2.2.1/virtinst/install/urldetect.py
 ===================================================================
---- virt-manager-2.2.0.orig/virtinst/install/urldetect.py
+--- virt-manager-2.2.1.orig/virtinst/install/urldetect.py
-+++ virt-manager-2.2.0/virtinst/install/urldetect.py
++++ virt-manager-2.2.1/virtinst/install/urldetect.py
 @@ -273,6 +273,12 @@ class _SUSEContent(object):
                          self.product_name.strip().rsplit(' ')[5][2])
              distro_version = sle_version
@@ -42,3 +42,11 @@ Index: virt-manager-2.2.0/virtinst/install/urldetect.py
  class _OESDistro(_SuseDistro):
      PRETTY_NAME = "OES"
      matching_distros = ["oes"]
+@@ -838,6 +855,7 @@ def _build_distro_list(osobj):
+         _SLESDistro,
+         _SLEDDistro,
+         _OpensuseDistro,
++        _CAASPDistro,
+         _OESDistro,
+         _DebianDistro,
+         _UbuntuDistro,

virtinst-add-pvh-support.patch

@@ -32,7 +32,7 @@ Index: virt-manager-2.2.1/virtinst/guest.py
 ===================================================================
 --- virt-manager-2.2.1.orig/virtinst/guest.py
 +++ virt-manager-2.2.1/virtinst/guest.py
-@@ -820,7 +820,7 @@ class Guest(XMLBuilder):
+@@ -821,7 +821,7 @@ class Guest(XMLBuilder):
  
          usb_tablet = False
          usb_keyboard = False

virtinst-add-sle15-detection-support.patch

@@ -1,9 +1,9 @@
 References: bsc#1054986
 
-Index: virt-manager-2.2.0/virtinst/install/urldetect.py
+Index: virt-manager-2.2.1/virtinst/install/urldetect.py
 ===================================================================
---- virt-manager-2.2.0.orig/virtinst/install/urldetect.py
+--- virt-manager-2.2.1.orig/virtinst/install/urldetect.py
-+++ virt-manager-2.2.0/virtinst/install/urldetect.py
++++ virt-manager-2.2.1/virtinst/install/urldetect.py
 @@ -586,6 +586,10 @@ class _SuseDistro(_RHELDistro):
          if re.search("openSUSE Tumbleweed", self.cache.treeinfo_name):
              return "opensusetumbleweed"
@@ -42,3 +42,11 @@ Index: virt-manager-2.2.0/virtinst/install/urldetect.py
  class _SLESDistro(_SuseDistro):
      PRETTY_NAME = "SLES"
      matching_distros = ["sles"]
+@@ -852,6 +867,7 @@ def _build_distro_list(osobj):
+         _FedoraDistro,
+         _RHELDistro,
+         _CentOSDistro,
++        _SLEDistro,
+         _SLESDistro,
+         _SLEDDistro,
+         _OpensuseDistro,

virtinst-detect-oes-distros.patch

@@ -1,9 +1,9 @@
 Enhancement to correctly detect Open Enterprise Server media is
 selected as the installation source.
-Index: virt-manager-2.2.0/virtinst/install/urldetect.py
+Index: virt-manager-2.2.1/virtinst/install/urldetect.py
 ===================================================================
---- virt-manager-2.2.0.orig/virtinst/install/urldetect.py
+--- virt-manager-2.2.1.orig/virtinst/install/urldetect.py
-+++ virt-manager-2.2.0/virtinst/install/urldetect.py
++++ virt-manager-2.2.1/virtinst/install/urldetect.py
 @@ -553,7 +553,7 @@ class _SuseDistro(_RHELDistro):
          if int(version) < 10:
              return self._variant_prefix + "9"
@@ -28,3 +28,11 @@ Index: virt-manager-2.2.0/virtinst/install/urldetect.py
  class _DebianDistro(_DistroTree):
      # ex. http://ftp.egr.msu.edu/debian/dists/sarge/main/installer-i386/
      # daily builds: https://d-i.debian.org/daily-images/amd64/
+@@ -830,6 +838,7 @@ def _build_distro_list(osobj):
+         _SLESDistro,
+         _SLEDDistro,
+         _OpensuseDistro,
++        _OESDistro,
+         _DebianDistro,
+         _UbuntuDistro,
+         _MageiaDistro,

virtinst-s390x-disable-graphics.patch

@@ -25,7 +25,7 @@ Index: virt-manager-2.2.1/virtinst/guest.py
              return True
  
          return False
-@@ -860,7 +863,7 @@ class Guest(XMLBuilder):
+@@ -861,7 +864,7 @@ class Guest(XMLBuilder):
          self.add_device(dev)
  
      def _add_default_video_device(self):
@@ -34,7 +34,7 @@ Index: virt-manager-2.2.1/virtinst/guest.py
              return
          if self.devices.video:
              return
-@@ -927,7 +930,7 @@ class Guest(XMLBuilder):
+@@ -928,7 +931,7 @@ class Guest(XMLBuilder):
              return
          if self.os.is_container() and not self.conn.is_vz():
              return

virtinst-set-qemu-emulator.patch

@@ -5,7 +5,7 @@ Index: virt-manager-2.2.1/virtinst/guest.py
 ===================================================================
 --- virt-manager-2.2.1.orig/virtinst/guest.py
 +++ virt-manager-2.2.1/virtinst/guest.py
-@@ -738,6 +738,10 @@ class Guest(XMLBuilder):
+@@ -739,6 +739,10 @@ class Guest(XMLBuilder):
          self._add_default_memballoon()
  
          self.clock.set_defaults(self)