[Libosinfo] [PATCH 1/2] win8.1: Add 2 more volume IDs

[Christophe Fergeau]

The regex matching x86-64 enterprise variants is not as strict as it
could: it's going to match IR5_CENNA_X64FREV or IR1_CENA_X64FREV for
example for which we don't have test cases.
However, I'm confident this will match
en_windows_8.1_enterprise_n_with_update_x64_dvd.iso and
en_windows_8.1_enterprise_x64_dvd.iso
if such ISOs exist, and that it's not going to give us false
positives. Since it might allow us to identify unknown ISOs
without false positives, I went for it.

Data was provided Vaclav Ehrlich
---
 data/oses/windows.xml.in                           | 11 +++++++-
 ..._enterprise_with_update_x64_dvd_6054382.iso.txt | 30 ++++++++++++++++++++++
 ...ndows_8.1_n_with_update_x86_dvd_6051704.iso.txt | 30 ++++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 9ab420c..fe4f862 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -1105,7 +1105,16 @@
     <media arch="x86_64">
       <variant id="enterprise"/>
       <iso>
-        <volume-id>(IR[13]_CENNA_X64FREV)_</volume-id>
+        <volume-id>(IR[135]_CENN?A_X64FREV)_</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>
+
+    <!-- No variant -->
+    <media arch="i686">
+      <iso>
+        <volume-id>(IR5_CCSNA_X86FRE)_</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>
diff --git a/test/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
new file mode 100644
index 0000000..017df86
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
@@ -0,0 +1,30 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: IR5_CENA_X64FREV_EN-US_DV9
+Volume set id: IR5_CENA_X64FREV_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: 2021076
+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_n_with_update_x86_dvd_6051704.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
new file mode 100644
index 0000000..c3badf7
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
@@ -0,0 +1,30 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: IR5_CCSNA_X86FRE_EN-US_DV9
+Volume set id: IR5_CCSNA_X86FRE_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: 1476196
+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 5B4 1460
-- 
2.4.3