8d6890f068
virt-manager-2.1.0.tar.bz2 virtman-fix-env-script-interpreter.patch * Bash autocompletion support (Lin Ma, Cole Robinson) * UI and command line –vsock support (Slavomir Kaslev) * virt-xml: Add –os-variant option (Andrea Bolognani) * virt-install: use libosinfo cpu, mem, disk size defaults (Fabiano Fidencio) * virt-install: Better usage of libosinfo -unknown distro IDs (Fabiano Fidencio) * virt-install: More usage of libosinfo for ISO –location detection * virt-install: Add –location LOCATION,kernel=X,initrd=Y for pointing to kernel/initrd in media that virt-install/libosinfo fails to detect - Drop 25b88733-urldetect-Dont-overload-suse_content-variable.patch 9308bae3-util-Fix-typo-vpcu-vcpu.patch b8aff280-virtinst-quickfix-ubuntu-net-preseed-insert-cdrom-error.patch c30b3bc6-increase-timeout-for-vm-to-start.patch virtinst-use-latest-opensuse-version-when-unknown-media.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=456
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
References: bsc#1054986
|
|
|
|
Index: virt-manager-2.1.0/virtinst/urldetect.py
|
|
===================================================================
|
|
--- virt-manager-2.1.0.orig/virtinst/urldetect.py
|
|
+++ virt-manager-2.1.0/virtinst/urldetect.py
|
|
@@ -580,6 +580,10 @@ class _SuseDistro(_RHELDistro):
|
|
if re.search("openSUSE Tumbleweed", self.cache.treeinfo_name):
|
|
return "opensusetumbleweed"
|
|
|
|
+ sp_version = False
|
|
+ if ' SP' in self.cache.treeinfo_version:
|
|
+ sp_version = True
|
|
+ self.cache.treeinfo_version = self.cache.treeinfo_version.replace(' SP', '.')
|
|
version, update = self.cache.split_version()
|
|
base = self._variant_prefix + str(version)
|
|
while update >= 0:
|
|
@@ -587,7 +591,10 @@ class _SuseDistro(_RHELDistro):
|
|
# SLE doesn't use '.0' for initial releases in
|
|
# osinfo-db (sles11, sles12, etc)
|
|
if update > 0 or not base.startswith('sle'):
|
|
- tryvar += ".%s" % update
|
|
+ if sp_version:
|
|
+ tryvar += "sp%s" % update
|
|
+ else:
|
|
+ tryvar += ".%s" % update
|
|
if OSDB.lookup_os(tryvar):
|
|
return tryvar
|
|
update -= 1
|
|
@@ -601,6 +608,14 @@ class _SuseDistro(_RHELDistro):
|
|
return var
|
|
|
|
|
|
+class _SLEDistro(_SuseDistro):
|
|
+ PRETTY_NAME = "SLE"
|
|
+ matching_distros = ["sle"]
|
|
+ _variant_prefix = "sle"
|
|
+ _suse_regex = ["SUSE Linux Enterprise$"]
|
|
+ famregex = "SUSE Linux Enterprise$"
|
|
+
|
|
+
|
|
class _SLESDistro(_SuseDistro):
|
|
PRETTY_NAME = "SLES"
|
|
matching_distros = ["sles"]
|