c085d819a8
virt-manager-1.5.0.tar.bz2 * python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat) * Switch –location ISO to use isoinfo (Andrew Wong) * virt-install: add –cpu numa distance handling (Menno Lageman) * virt-install: fix –disk for rbd volumes with auth (Rauno Väli) * virt-install: add –cputune vcpupin handling (Wim ten Have) * details ui: Showing attached scsi devices per controller (Lin Ma) * network ui: Show details about SR-IOV VF pool (Lin Ma) * Greatly expand UI test suite coverage - Dropped patches 0001-Improve-container-image-url-example.patch 0001-py3-store-exception-variables-for-use-outside-except.patch 0002-create-wizard-fix-alignment-in-os-container-page.patch 0003-oscontainer-ask-root-password-in-the-wizard.patch 0004-Harmonize-invisible_char-values.patch 083dfcc8-Show-details-about-the-network-of-SR-IOV-VF-pool.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch 0c6bcb09-fix-bytes-string-mess-in-serial-console.patch 0e812e3c-dont-skip-authentication-for-listen-type-none-with-fixed-QEMU.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch 2d276ebe-progress-dont-overwrite-format.patch 2eb455c9-correctly-calculate-virtio-scsi-controller-index.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch 37ea5207-replace-StandardError-with-Exception.patch 3b769643-dont-add-URI-into-params-for-tunneled-migration.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 44de92b7-use-reload-from-imp-module.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 67122615-python2to3-division-compatability.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=406
72 lines
3.0 KiB
Diff
72 lines
3.0 KiB
Diff
Enhancement to correctly detect Open Enterprise Server media is
|
|
selected as the installation source.
|
|
Index: virt-manager-1.5.0/virtinst/urlfetcher.py
|
|
===================================================================
|
|
--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py
|
|
+++ virt-manager-1.5.0/virtinst/urlfetcher.py
|
|
@@ -482,6 +482,10 @@ def _distroFromSUSEContent(fetcher, arch
|
|
dclass = SLEDDistro
|
|
if distro_version is None:
|
|
distro_version = _parse_sle_distribution(distribution)
|
|
+ elif re.match(".*Open Enterprise Server*", distribution[1]):
|
|
+ dclass = OESDistro
|
|
+ if distro_version is None:
|
|
+ distro_version = _parse_sle_distribution(distribution)
|
|
elif re.match(".*openSUSE.*", distribution[1]):
|
|
dclass = OpensuseDistro
|
|
if distro_version is None:
|
|
@@ -1042,20 +1046,30 @@ 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:
|
|
- if self.os_variant.startswith(("sles", "sled")):
|
|
- sp_version = None
|
|
- if len(distro_version.split('.', 1)) == 2:
|
|
- sp_version = 'sp' + distro_version.split('.', 1)[1].strip()
|
|
- self.os_variant += version
|
|
- if sp_version:
|
|
- self.os_variant += sp_version
|
|
+
|
|
+ sp_version = None
|
|
+ if self.os_variant.startswith(("sles", "sled")):
|
|
+ if len(distro_version.split('.', 1)) == 2:
|
|
+ sp_version = 'sp' + distro_version.split('.', 1)[1].strip()
|
|
+ self.os_variant += version
|
|
+ if sp_version:
|
|
+ self.os_variant += sp_version
|
|
+ elif self.os_variant.startswith("opensuse"):
|
|
+ if len(version) == 8:
|
|
+ self.os_variant += "tumbleweed"
|
|
else:
|
|
- # Tumbleweed 8 digit date
|
|
- if len(version) == 8:
|
|
- self.os_variant += "tumbleweed"
|
|
- else:
|
|
- self.os_variant += distro_version
|
|
+ self.os_variant += distro_version
|
|
+ elif self.os_variant.startswith("oes"):
|
|
+ versions = distro_version.split('.')
|
|
+ major_version = versions[0]
|
|
+ if len(versions) == 3:
|
|
+ sp_version = versions[2]
|
|
+ elif len(versions) == 2:
|
|
+ sp_version = versions[1]
|
|
+ if sp_version:
|
|
+ self.os_variant += major_version + 'sp' + sp_version
|
|
+ else:
|
|
+ self.os_variant += major_version
|
|
else:
|
|
self.os_variant += "9"
|
|
|
|
@@ -1102,6 +1116,9 @@ class SLESDistro(SuseDistro):
|
|
class SLEDDistro(SuseDistro):
|
|
urldistro = "sled"
|
|
|
|
+class OESDistro(SuseDistro):
|
|
+ urldistro = "oes"
|
|
+
|
|
|
|
# Suse image store is harder - we fetch the kernel RPM and a helper
|
|
# RPM and then munge bits together to generate a initrd
|