pool/virt-manager
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bsc#1194323 - [jsc#SLE-19237][virt-manager] Detected the wrong

Browse Source 
win2k22 guest system version from the local install media
  virtinst-windows-server-detection.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=556
This commit is contained in:
Charles Arnold 2022-01-20 22:48:07 +00:00 committed by Git OBS Bridge
parent fd53d69443
commit 731a9402db
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virt-manager.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 20 15:46:02 MST 2022 - carnold@suse.com
- bsc#1194323 - [jsc#SLE-19237][virt-manager] Detected the wrong
win2k22 guest system version from the local install media
virtinst-windows-server-detection.patch
-------------------------------------------------------------------
Thu Jan 13 13:33:50 MST 2022 - carnold@suse.com

2
virt-manager.spec
View File

@ -94,6 +94,7 @@ Patch180: virtinst-keep-iso-for-xenpv.patch
Patch181: virtinst-add-slem-detection-support.patch
Patch182: virtinst-add-sle-hpc-support.patch
Patch183: virtinst-add-oracle-linux-support.patch
Patch184: virtinst-windows-server-detection.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -234,6 +235,7 @@ machine).
%patch181 -p1
%patch182 -p1
%patch183 -p1
%patch184 -p1
%build
%if %{default_hvs}

23
virtinst-windows-server-detection.patch Normal file
View File

@ -0,0 +1,23 @@
References: bsc#1194323
Windows server 2k16, 2k19, and 2k22 have the volumen ID
so libosinfo can't really tell them apart.
This hack after detecting a windows ISO just looks at the
ISO filename for an extra clue.
--- virt-manager-3.2.0/virtinst/install/installer.py.orig 2022-01-20 15:40:27.849623677 -0700
+++ virt-manager-3.2.0/virtinst/install/installer.py 2022-01-20 15:42:22.229628567 -0700
@@ -541,6 +541,14 @@ class Installer(object):
osguess = OSDB.guess_os_by_iso(self.cdrom)
if osguess:
ret = osguess[0]
+ # Hack because windows ISOs contain same volume ID
+ if ret and ret.startswith("win"):
+ if "windows_server_2022" in self.cdrom:
+ ret = "win2k22"
+ elif "windows_server_2019" in self.cdrom:
+ ret = "win2k19"
+ elif "windows_server_2016" in self.cdrom:
+ ret = "win2k16"
else:
log.debug("No media for distro detection.")