[Libosinfo] [PATCH v4 06/12] win8.1: Add two more "no variant" volume ids

[Fabiano Fidêncio]

From: Fabiano Fidêncio <fabiano at fidencio.org>

Signed-off-by: Fabiano Fidêncio <fabiano at fidencio.org>
---
 data/os/microsoft.com/win-8.1.xml.in               |  7 ++++++
 ...ndows_8.1_n_with_update_x64_dvd_6051677.iso.txt | 29 ++++++++++++++++++++++
 ...windows_8.1_with_update_x64_dvd_6051480.iso.txt | 29 ++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt

diff --git a/data/os/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in
index f746d10..92043bb 100644
--- a/data/os/microsoft.com/win-8.1.xml.in
+++ b/data/os/microsoft.com/win-8.1.xml.in
@@ -107,6 +107,13 @@
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
     </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(IR5_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>
 
     <!-- Variant unknown -->
     <media arch="i686">
diff --git a/test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
new file mode 100644
index 0000000..f26de05
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR5_CCSNA_X64FRE_EN-US_DV9
+Volume set id: IR5_CCSNA_X64FRE_EN-US_DV9
+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: 1990169
+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 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt
new file mode 100644
index 0000000..5af8419
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR5_CCSA_X64FRE_EN-US_DV9
+Volume set id: IR5_CCSA_X64FRE_EN-US_DV9
+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: 2109632
+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 86A 2154
-- 
2.7.3