544164a095
virt-manager-1.4.1.tar.bz2 * storage/nodedev event API support (Jovanka Gulicoska) * UI options for enabling spice GL (Marc-André Lureau) * Add default virtio-rng /dev/urandom for supported guest OS * Cloning and rename support for UEFI VMs (Pavel Hrdina) * libguestfs inspection UI improvements (Pino Toscano) * virt-install: Add –qemu-commandline * virt-install: Add –network vhostuser (Chen Hanxiao) * virt-install: Add –sysinfo (Charles Arnold) - Dropped the following patches contained in new tarball 0425975f-use-virDomainMigrate3-API.patch 0910c8dc-black-display-if-graphic-mode-vnc-and-listen-type-none.patch 1d2cd306-Fix-incorrect-usage-of-virtio-input.patch 2df8dc39-detect-whether-IP-address-comes-from-DHCP-server.patch 559e813b-xmlbuilder-02.patch 561f5cd3-drop-xenmigr-scheme-from-Xen-migration-URI.patch 5a11cf07-virt-manager-generates-invalid-guest-XML.patch 617b9271-dont-return-virtio1.0-net-as-valid-device-name.patch 63784f4d-document-new-sysinfo-option.patch 6daff68a-fix-italian-lang-file.patch 7962672c-fix-error-checking-extra_args.patch 835ddc5f-xmlbuilder-04.patch a3206f89-Add-the-sysinfo-option.patch a931a1a6-xmlbuilder-03.patch b08647c2-xmlbuilder-05.patch b31c0b44-Add-classes-for-defining-SMBios-information.patch b4858842-fix-bad-version-check-regression.patch b8dccf6a-fix-connection-to-remote-spice-with-password.patch c5ce0ab5-connection-fix-transport-detection.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=341
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
References: bsc#1010060
|
|
Notes: SUSE Containers as a Service Platform and 'CASP' are not
|
|
names set in stone yet and could change before the product ships.
|
|
|
|
Index: virt-manager-1.4.1/virtinst/urlfetcher.py
|
|
===================================================================
|
|
--- virt-manager-1.4.1.orig/virtinst/urlfetcher.py
|
|
+++ virt-manager-1.4.1/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 Containers as a Service Platform*", distribution[1]):
|
|
+ dclass = CASPDistro
|
|
+ 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:
|
|
@@ -1021,7 +1025,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:
|
|
@@ -1035,6 +1040,8 @@ class SuseDistro(Distro):
|
|
self.os_variant += "tumbleweed"
|
|
else:
|
|
self.os_variant += distro_version
|
|
+ elif version_int == 1 and self.os_variant.startswith("casp"):
|
|
+ self.os_variant = "casp"
|
|
else:
|
|
self.os_variant += "9"
|
|
|
|
@@ -1081,6 +1088,9 @@ class SLESDistro(SuseDistro):
|
|
class SLEDDistro(SuseDistro):
|
|
urldistro = "sled"
|
|
|
|
+class CASPDistro(SuseDistro):
|
|
+ urldistro = "casp"
|
|
+
|
|
|
|
# Suse image store is harder - we fetch the kernel RPM and a helper
|
|
# RPM and then munge bits together to generate a initrd
|