[Libosinfo] [PATCH v2 07/10] win10: Add two (x86_64) volume IDs

[Fabiano Fidêncio]

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 data/os/microsoft.com/win-10.xml.in                |  9 +++++++
 ...ws_10_multiple_editions_x64_dvd_6846432.iso.txt | 29 ++++++++++++++++++++++
 ..._10_n_multiple_editions_x64_dvd_6846434.iso.txt | 29 ++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 test/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
 create mode 100644 test/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt

diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
index df976ee..5dbe6ce 100644
--- a/data/os/microsoft.com/win-10.xml.in
+++ b/data/os/microsoft.com/win-10.xml.in
@@ -75,6 +75,15 @@
       </iso>
     </media>
 
+    <!-- No Variant -->
+    <media arch="x86_64">
+      <iso>
+        <volume-id>J_CCSN?A_X64FRE_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
     <resources arch="i686">
       <minimum>
         <cpu>1000000000</cpu>
diff --git a/test/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt b/test/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
new file mode 100644
index 0000000..000529b
--- /dev/null
+++ b/test/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: J_CCSA_X64FRE_EN-US_DV5
+Volume set id: J_CCSA_X64FRE_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1994069
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 221 545
diff --git a/test/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt b/test/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt
new file mode 100644
index 0000000..b8b536d
--- /dev/null
+++ b/test/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: J_CCSNA_X64FRE_EN-US_DV5
+Volume set id: J_CCSNA_X64FRE_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1880567
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 221 545
-- 
2.7.4