|
 |
a034fe |
From 5686e157c90ccbe65d7c719f53d36028b6364b11 Mon Sep 17 00:00:00 2001
|
|
|
a034fe |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
a034fe |
Date: Thu, 28 Feb 2019 11:00:27 +0100
|
|
|
a034fe |
Subject: [PATCH] v2v: -o libvirt: write win2k19 osinfo ID
|
|
|
a034fe |
|
|
|
a034fe |
When writing the libosinfo metadata in the libvirt XML, use the newly
|
|
|
a034fe |
added (in osinfo-db) ID for Windows Server 2019; sadly, this version of
|
|
|
a034fe |
Windows has the same version as Windows Server 2016, so distinguish it
|
|
|
a034fe |
by looking at its product name.
|
|
|
a034fe |
|
|
|
a034fe |
(cherry picked from commit bb11507fff8c65275afc0f29806d3b3de387c7f9)
|
|
|
a034fe |
---
|
|
|
a034fe |
v2v/create_libvirt_xml.ml | 5 +++++
|
|
|
a034fe |
1 file changed, 5 insertions(+)
|
|
|
a034fe |
|
|
|
a034fe |
diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml
|
|
|
a034fe |
index a8dc1f2f0..dbc24315f 100644
|
|
|
a034fe |
--- a/v2v/create_libvirt_xml.ml
|
|
|
a034fe |
+++ b/v2v/create_libvirt_xml.ml
|
|
|
a034fe |
@@ -124,6 +124,11 @@ let get_osinfo_id = function
|
|
|
a034fe |
| { i_type = "windows"; i_major_version = 6; i_minor_version = 3 } ->
|
|
|
a034fe |
Some "http://microsoft.com/win/8.1"
|
|
|
a034fe |
|
|
|
a034fe |
+ | { i_type = "windows"; i_major_version = 10; i_minor_version = 0;
|
|
|
a034fe |
+ i_product_variant = "Server"; i_product_name = product }
|
|
|
a034fe |
+ when String.find product "2019" >= 0 ->
|
|
|
a034fe |
+ Some "http://microsoft.com/win/2k19"
|
|
|
a034fe |
+
|
|
|
a034fe |
| { i_type = "windows"; i_major_version = 10; i_minor_version = 0;
|
|
|
a034fe |
i_product_variant = "Server" } ->
|
|
|
a034fe |
Some "http://microsoft.com/win/2k16"
|
|
|
a034fe |
--
|
|
|
a034fe |
2.21.0
|
|
|
a034fe |
|