Sync from SUSE:SLFO:Main virt-manager revision bb1af2debc2cd4d290ae8dc512d9a2ad
This commit is contained in:
parent
3b8ccbbe54
commit
057e40033e
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 7 13:30:54 MDT 2024 - carnold@suse.com
|
||||
|
||||
- bsc#1222738 - virt-manager shows SLE Micro 6.0 in suggested OS
|
||||
version should be SL Micro 6.0
|
||||
virtinst-add-slm-detection-support.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 7 14:59:08 MST 2024 - carnold@suse.com
|
||||
|
||||
- Disable mdev tests with introduction of libvirt 10.1.0
|
||||
virt-manager.spec
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 12 10:50:32 MST 2024 - carnold@suse.com
|
||||
|
||||
|
@ -148,10 +148,11 @@ Patch180: virtinst-keep-iso-for-xenpv.patch
|
||||
Patch181: virtinst-add-slem-detection-support.patch
|
||||
Patch182: virtinst-add-sle-hpc-support.patch
|
||||
Patch183: virtinst-add-oracle-linux-support.patch
|
||||
Patch184: virtinst-windows-server-detection.patch
|
||||
Patch185: virtman-fix-shared-disk-request-alignment-error.patch
|
||||
Patch186: virtman-language-fixes.patch
|
||||
Patch187: virtman-fix-inspection-apps-window.patch
|
||||
Patch184: virtinst-add-slm-detection-support.patch
|
||||
Patch185: virtinst-windows-server-detection.patch
|
||||
Patch186: virtman-fix-shared-disk-request-alignment-error.patch
|
||||
Patch187: virtman-language-fixes.patch
|
||||
Patch188: virtman-fix-inspection-apps-window.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -285,6 +286,14 @@ donttest="$donttest or testCLI0203virt_install_bhyve_default_f27"
|
||||
donttest="$donttest or testCLI0280virt_xml_build_disk_domain"
|
||||
donttest="$donttest or testCLI0287virt_xml_edit_cpu_host_copy"
|
||||
donttest="$donttest or testCLI0288virt_xml_build_pool_logical_disk"
|
||||
# Disabled tests for libvirt 10.1.0
|
||||
donttest="$donttest or testDASDMdev"
|
||||
donttest="$donttest or testAPQNMdev"
|
||||
donttest="$donttest or testPCIMdev"
|
||||
donttest="$donttest or testPCIMdevNewFormat"
|
||||
donttest="$donttest or testCLI0369virt_xml_add_hostdev_mdev"
|
||||
donttest="$donttest or testCLI0377virt_xml_add_hostdev_mdev_start"
|
||||
# End disabled tests for libvirt 10.1.0
|
||||
donttest="$donttest or testCLI0375virt_xml_add_disk_create_storage_start"
|
||||
# Due to the above skips:
|
||||
# "there are XML properties that are untested in the test suite"
|
||||
|
51
virtinst-add-slm-detection-support.patch
Normal file
51
virtinst-add-slm-detection-support.patch
Normal file
@ -0,0 +1,51 @@
|
||||
Add support for detecting SUSE Linux Micro 6.0 and newer.
|
||||
See also the osinfo-db package for the description file.
|
||||
Note that starting with Micro version 6.0, the word "Enterprise" was
|
||||
dropped from the Micro version name.
|
||||
|
||||
Index: virt-manager-4.1.0/virtinst/install/urldetect.py
|
||||
===================================================================
|
||||
--- virt-manager-4.1.0.orig/virtinst/install/urldetect.py
|
||||
+++ virt-manager-4.1.0/virtinst/install/urldetect.py
|
||||
@@ -271,13 +271,16 @@ class _SUSEContent(object):
|
||||
",", 1)[0].strip().rsplit(":")[4]
|
||||
distro_version = distro_version.strip()
|
||||
|
||||
- if "Enterprise" in self.product_name or "SLES" in self.product_name:
|
||||
+ if "Enterprise" in self.product_name or "SLES" in self.product_name or "Micro" in self.product_name:
|
||||
if " SAP " in self.product_name:
|
||||
sle_version = self.product_name.strip().rsplit(' ')[7]
|
||||
if " High Performance " in self.product_name:
|
||||
sle_version = self.product_name.strip().rsplit(' ')[6]
|
||||
else:
|
||||
- sle_version = self.product_name.strip().rsplit(' ')[4]
|
||||
+ if "SUSE Linux Micro" in self.product_name:
|
||||
+ sle_version = self.product_name.strip().rsplit(' ')[3]
|
||||
+ else:
|
||||
+ sle_version = self.product_name.strip().rsplit(' ')[4]
|
||||
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 + '.' +
|
||||
@@ -708,6 +711,14 @@ class _MICRODistro(_SuseDistro):
|
||||
famregex = ".*SUSE Linux Enterprise Micro.*"
|
||||
|
||||
|
||||
+class _SLMICRODistro(_SuseDistro):
|
||||
+ PRETTY_NAME = "SLES"
|
||||
+ matching_distros = ["slm"]
|
||||
+ _variant_prefix = "slm"
|
||||
+ _suse_regex = [".*SUSE Linux Micro*", ".*SUSE Micro*"]
|
||||
+ famregex = ".*SUSE Linux Micro.*"
|
||||
+
|
||||
+
|
||||
class _CAASPDistro(_SuseDistro):
|
||||
PRETTY_NAME = "SLES"
|
||||
matching_distros = ["caasp"]
|
||||
@@ -977,6 +988,7 @@ def _build_distro_list(osobj):
|
||||
_SLEDDistro,
|
||||
_OpensuseDistro,
|
||||
_MICRODistro,
|
||||
+ _SLMICRODistro,
|
||||
_CAASPDistro,
|
||||
_OESDistro,
|
||||
_DebianDistro,
|
Loading…
Reference in New Issue
Block a user