pool/virt-manager
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 886769 from Virtualization

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/886769
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=222
This commit is contained in:
Dominique Leuenberger 2021-04-23 15:49:37 +00:00 committed by Git OBS Bridge
commit 128873b469
3 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virt-manager.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 12 13:01:27 MDT 2021 - carnold@suse.com
- Add support for detecting SUSE Linux Enterprise Micro. See also
the osinfo-db package for the SLEM OS description file.
virtinst-add-slem-detection-support.patch
-------------------------------------------------------------------
Wed Feb 24 14:10:01 MST 2021 - acho@suse.com

2
virt-manager.spec
View File

@ -79,6 +79,7 @@ Patch177: virtinst-set-default-nic.patch
Patch178: virtinst-sap-detection.patch
Patch179: virtinst-smbios-unsupported-for-xenpv.patch
Patch180: virtinst-keep-iso-for-xenpv.patch
Patch181: virtinst-add-slem-detection-support.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -211,6 +212,7 @@ machine).
%patch178 -p1
%patch179 -p1
%patch180 -p1
%patch181 -p1
%build
%if %{default_hvs}

49
virtinst-add-slem-detection-support.patch Normal file
View File

@ -0,0 +1,49 @@
Add support for detecting SUSE Linux Enterprise Micro.
See also the osinfo-db package for the description file.
Index: virt-manager-3.2.0/virtinst/install/urldetect.py
===================================================================
--- virt-manager-3.2.0.orig/virtinst/install/urldetect.py
+++ virt-manager-3.2.0/virtinst/install/urldetect.py
@@ -275,7 +275,7 @@ class _SUSEContent(object):
sle_version = self.product_name.strip().rsplit(' ')[7]
else:
sle_version = self.product_name.strip().rsplit(' ')[4]
- if len(self.product_name.strip().rsplit(' ')) > 5:
+ if len(self.product_name.strip().rsplit(' ')) > 5 and not " Micro " in self.product_name:
if " SAP " in self.product_name:
sle_version = (sle_version + '.' +
self.product_name.strip().rsplit(' ')[8][2])
@@ -596,6 +596,9 @@ class _SuseDistro(_RHELDistro):
version = distro_version.split('.', 1)[0].strip()
+ if self._variant_prefix.startswith(("slem")):
+ return self._variant_prefix + distro_version
+
if self._variant_prefix.startswith(("caasp")):
return self._variant_prefix + distro_version
@@ -683,6 +686,14 @@ class _OpensuseDistro(_SuseDistro):
famregex = ".*openSUSE.*"
+class _MICRODistro(_SuseDistro):
+ PRETTY_NAME = "SLES"
+ matching_distros = ["slem"]
+ _variant_prefix = "slem"
+ _suse_regex = [".*SUSE Linux Enterprise Micro*", ".*SUSE Micro*"]
+ famregex = ".*SUSE Linux Enterprise Micro.*"
+
+
class _CAASPDistro(_SuseDistro):
PRETTY_NAME = "SLES"
matching_distros = ["caasp"]
@@ -929,6 +940,7 @@ def _build_distro_list(osobj):
_SLESDistro,
_SLEDDistro,
_OpensuseDistro,
+ _MICRODistro,
_CAASPDistro,
_OESDistro,
_DebianDistro,