virt-manager/virtinst-media-detection.patch

35 lines
1.7 KiB
Diff
Raw Normal View History

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
- bsc#1140211 - VUL-1: CVE-2019-10183: virt-manager: unattended option leaks password via command line argument 58c68764-unattended-Read-the-passwords-from-a-file.patch 51d28f04-unattended-Dont-log-user-admin-passwords.patch - Upstream bug fix (bsc#1027942) 5312a961-virt-install-Revive-wait-0-as-alias-for-noautoconsole.patch - Update to virt-manager 2.2.0 (fate#326786) virt-manager-2.2.0.tar.bz2 * libvirt XML viewing and editing UI for new and existing domain, pools, volumes, networks * virt-install: libosinfo –unattended support (Fabiano Fidêncio, Cole Robinson) * Improve CPU model security defaults (Pavel Hrdina) * virt-install: new –install option. Ex: virt-install –install fedora29 * virt-install: new –install kernel=,initrd= * virt-install: –disk, –memory, –name defaults from libosinfo (Fabiano Fidêncio, Cole Robinson) * virt-install: add device suboption aliases which consistently match libvirt XML naming * virt-xml: new –start, –no-define options (Marc Hartmayer) * virt-install: Add driver_queues argument to –controller (Vasudeva Kamath) * RISC-V support (Andrea Bolognani) * Device default improvements for non-x86 KVM (Andrea Bolognani) * Redesigned ‘New Network’ wizard * libguestfs inspection improvements (Pino Toscano) * virt-install: Add support for xenbus controller (Jim Fehlig) * cli: Add –disk wwn=,rawio= (Athina Plaskasoviti) * cli: Add –memballoon autodeflate=,stats.period= (Athina Plaskasoviti) * cli: Add –iothreads (Athina Plaskasoviti) * cli: Add –numatune memory.placement (Athina Plaskasoviti) * cli: Add –launchSecurity option (Erik Skultety) * cli: Fill in –memorybacking options * cli: –smartcard: support database= and certificate[0-9]*= OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=476
2019-07-03 20:19:42 +02:00
Index: virt-manager-2.2.0/virtinst/install/urldetect.py
===================================================================
- bsc#1140211 - VUL-1: CVE-2019-10183: virt-manager: unattended option leaks password via command line argument 58c68764-unattended-Read-the-passwords-from-a-file.patch 51d28f04-unattended-Dont-log-user-admin-passwords.patch - Upstream bug fix (bsc#1027942) 5312a961-virt-install-Revive-wait-0-as-alias-for-noautoconsole.patch - Update to virt-manager 2.2.0 (fate#326786) virt-manager-2.2.0.tar.bz2 * libvirt XML viewing and editing UI for new and existing domain, pools, volumes, networks * virt-install: libosinfo –unattended support (Fabiano Fidêncio, Cole Robinson) * Improve CPU model security defaults (Pavel Hrdina) * virt-install: new –install option. Ex: virt-install –install fedora29 * virt-install: new –install kernel=,initrd= * virt-install: –disk, –memory, –name defaults from libosinfo (Fabiano Fidêncio, Cole Robinson) * virt-install: add device suboption aliases which consistently match libvirt XML naming * virt-xml: new –start, –no-define options (Marc Hartmayer) * virt-install: Add driver_queues argument to –controller (Vasudeva Kamath) * RISC-V support (Andrea Bolognani) * Device default improvements for non-x86 KVM (Andrea Bolognani) * Redesigned ‘New Network’ wizard * libguestfs inspection improvements (Pino Toscano) * virt-install: Add support for xenbus controller (Jim Fehlig) * cli: Add –disk wwn=,rawio= (Athina Plaskasoviti) * cli: Add –memballoon autodeflate=,stats.period= (Athina Plaskasoviti) * cli: Add –iothreads (Athina Plaskasoviti) * cli: Add –numatune memory.placement (Athina Plaskasoviti) * cli: Add –launchSecurity option (Erik Skultety) * cli: Fill in –memorybacking options * cli: –smartcard: support database= and certificate[0-9]*= OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=476
2019-07-03 20:19:42 +02:00
--- virt-manager-2.2.0.orig/virtinst/install/urldetect.py
+++ virt-manager-2.2.0/virtinst/install/urldetect.py
@@ -488,8 +488,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: