[Libosinfo] [PATCH] win: Add ISO data for 2 more Vista releases

[Christophe Fergeau]

---
 data/oses/windows.xml.in                           |  6 ++---
 ...ows_vista_enterprise_sp2_x64_dvd_342332.iso.txt | 29 ++++++++++++++++++++++
 ...ows_vista_enterprise_sp2_x86_dvd_342329.iso.txt | 29 ++++++++++++++++++++++
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
 create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index e60257a..b08fe29 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -690,15 +690,15 @@
 
     <media arch="i686">
       <iso>
-        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRMBVOL|FRMEVOL|FRMCFRE)_</volume-id>
+        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRTMEVOL|FRMBVOL|FRMEVOL|FRMCFRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMBXVOL|FRMEXVOL|FRMCXFRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRTMEXVOL|FRMBXVOL|FRMEXVOL)_</volume-id>
+       <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
     </media>
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
new file mode 100644
index 0000000..16d2c5e
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x64_dvd_342332.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: FRTMEXVOL_EN_DVD
+Volume set id: FRTMEXVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (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: 1565407
+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 4
+        Bootoff 265 613
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt
new file mode 100644
index 0000000..de73c15
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: FRTMEVOL_EN_DVD
+Volume set id: FRTMEVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (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: 1182120
+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 4
+        Bootoff 267 615
-- 
2.4.0