56082a3f99
virt-manager-1.4.1.tar.bz2 virtinst-check-date-format.patch virtinst-no-usb-tablet-for-xenpv.patch * New VM wixard virt-bootstrap integration (Radostin Stoyanov) * New VM wizard support for virtuozzo containers (Mikhail Feoktistov) * network UI: add support to create SR-IOV VF pool (Lin Ma) * Nicer OS list in New VM wizard (Pino Toscano) * Better defaults for UEFI secureboot builds (Pavel Hrdina) * Fix defaults for aarch64 VMs if graphics are requested * virt-install: new –memdev option (Pavel Hrdina) * virt-install: add –disk logical/physical_block_size (Yuri Arabadji) * virt-install: add –features hyperv_reset=, hyperv_synic= (Venkat Datta N H) - Dropped the following patches contained in new tarball f5d709d9-lang-it-1.patch c66098f3-lang-it-2.patch 452a693e-lang-update.patch 6b5106ea-lang-it-ko-fix.patch 9c8ffe51-fix-multiple-warnings-1.patch cb182f7e-skip-authentication-only-for-VNC-with-listen-type-none.patch 0610cd6a-ensure-bool-value-used-for-set_sensitive-call.patch f341352c-remove-redundant-error-string.patch ff3b4dc5-dont-overwrite-install-bootorder.patch 2099a194-reset-guest-domain-to-none-on-domain-creation-error.patch 93085d2b-reset-guest-domain-to-none-on-domain-creation-error.patch 7aee124d-fix-multiple-warnings-2.patch f38c56c9-add-support-for-SMM-feature.patch 24f9d053-add-support-for-loader-secure-attribute.patch 4f8e795c-if-required-by-UEFI-enable-SMM-feature-and-set-q35-machine-type.patch b690908a-enable-secure-feature-together-with-smm-for-UEFI.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=356
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
References: bsc#1010060
|
|
|
|
Index: virt-manager-1.4.2/virtinst/urlfetcher.py
|
|
===================================================================
|
|
--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
|
|
+++ virt-manager-1.4.2/virtinst/urlfetcher.py
|
|
@@ -464,6 +464,10 @@ def _distroFromSUSEContent(fetcher, arch
|
|
dclass = SLESDistro
|
|
if distro_version is None:
|
|
distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
|
|
+ elif re.match(".*SUSE Container as a Service Platform*", distribution[1]):
|
|
+ dclass = CAASPDistro
|
|
+ if distro_version is None:
|
|
+ distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[6]]
|
|
elif re.match(".*openSUSE.*", distribution[1]):
|
|
dclass = OpensuseDistro
|
|
if distro_version is None:
|
|
@@ -1026,7 +1030,8 @@ class SuseDistro(Distro):
|
|
distro_version = self.version_from_content[1].strip()
|
|
version = distro_version.split('.', 1)[0].strip()
|
|
self.os_variant = self.urldistro
|
|
- if int(version) >= 10:
|
|
+ version_int = int(version)
|
|
+ if version_int >= 10:
|
|
if self.os_variant.startswith(("sles", "sled")):
|
|
sp_version = None
|
|
if len(distro_version.split('.', 1)) == 2:
|
|
@@ -1040,6 +1045,8 @@ class SuseDistro(Distro):
|
|
self.os_variant += "tumbleweed"
|
|
else:
|
|
self.os_variant += distro_version
|
|
+ elif version_int == 1 and self.os_variant.startswith("caasp"):
|
|
+ self.os_variant = "caasp"
|
|
else:
|
|
self.os_variant += "9"
|
|
|
|
@@ -1086,6 +1093,9 @@ class SLESDistro(SuseDistro):
|
|
class SLEDDistro(SuseDistro):
|
|
urldistro = "sled"
|
|
|
|
+class CAASPDistro(SuseDistro):
|
|
+ urldistro = "caasp"
|
|
+
|
|
|
|
# Suse image store is harder - we fetch the kernel RPM and a helper
|
|
# RPM and then munge bits together to generate a initrd
|