6471f89f17
libvirt 8d9743d6-virt-install-Add-support-for-xenbus-controller.patch - bsc#1129176 - SLES 12 SP4 - kvm virt-install using ttyS0 leads to user process fault and interrupts installation (virt-manager) 5bc847eb-virt-install-Do-not-warn-about-consoles-on-s390x.patch - bsc#1129309 - Missing .treeinfo file on the media for CaaSP virtinst-add-caasp-support.patch - Add detection for Caasp 4.0 virtinst-media-detection.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=463
33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
When both the content file and .treeinfo file are missing from the media
|
|
look in the media.1/products and media.1/media files for information.
|
|
Caasp 4.0 has not content or .treeinfo file on the media
|
|
|
|
--- virt-manager-2.1.0/virtinst/urldetect.py.orig 2019-03-13 15:34:14.489019082 -0600
|
|
+++ virt-manager-2.1.0/virtinst/urldetect.py 2019-03-13 15:34:56.813552736 -0600
|
|
@@ -485,8 +485,23 @@ class _SuseDistro(_RHELDistro):
|
|
cache.checked_for_suse_content = True
|
|
content_str = cache.acquire_file_content("content")
|
|
if content_str is None:
|
|
- return False
|
|
-
|
|
+ products_str = cache.acquire_file_content("media.1/products")
|
|
+ if products_str:
|
|
+ products_str = products_str.replace('/', ' ,', 1)
|
|
+ products_str = "DISTRO " + products_str.replace('-', ' ')
|
|
+ media_str = cache.acquire_file_content("media.1/media")
|
|
+ if media_str:
|
|
+ media_arch = "x86_64"
|
|
+ if 'aarch64' in media_str:
|
|
+ media_arch = "aarch64"
|
|
+ elif 'ppc64le' in media_str:
|
|
+ media_arch = "ppc64le"
|
|
+ elif 's390x' in media_str:
|
|
+ media_arch = "s390x"
|
|
+ media_str = 'BASEARCHS ' + media_arch
|
|
+ if products_str is None and media_str is None:
|
|
+ return False
|
|
+ content_str = products_str + "\n" + media_str
|
|
try:
|
|
cache.suse_content = _SUSEContent(content_str)
|
|
except Exception as e:
|