These are from DVD media I snagged off MSDN years ago. Unforunately
I renamed them a long time ago and I don't know the original file
names, hence the generic 'unknown' in the test data names.
Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx>
---
v2:
Add test data
data/oses/windows.xml.in | 8 +++---
.../en_windows_7_ultimate_x64_dvd_unknown.iso.txt | 29 ++++++++++++++++++++++
.../win7/en_windows_7_ultimate_x64_dvd_unknown.lng | 2 ++
.../en_windows_7_ultimate_x86_dvd_unknown.iso.txt | 29 ++++++++++++++++++++++
.../win7/en_windows_7_ultimate_x86_dvd_unknown.lng | 2 ++
...ise_with_service_pack_1_x64_dvd_unknown.iso.txt | 29 ++++++++++++++++++++++
...ise_with_service_pack_1_x86_dvd_unknown.iso.txt | 29 ++++++++++++++++++++++
7 files changed, 124 insertions(+), 4 deletions(-)
create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index b7d5c21..39d5b55 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -690,14 +690,14 @@
<media arch="i686">
<iso>
- <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRMBVOL|FRMEVOL)_</volume-id>
+ <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|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)_</volume-id>
+ <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMBXVOL|FRMEXVOL|FRMCXFRE)_</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>
@@ -805,7 +805,7 @@
<media arch="i686" installer-reboots="2">
<variant id="ultimate"/>
<iso>
- <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER)_</volume-id>
+ <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_</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>
@@ -813,7 +813,7 @@
<media arch="x86_64" installer-reboots="2">
<variant id="ultimate"/>
<iso>
- <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER)_</volume-id>
+ <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER|GRMCNULXFRER)_</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>
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
new file mode 100644
index 0000000..fafea58
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GRMCNULXFRER_EN_DVD
+Volume set id: GRMCNULXFRER_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: 1420193
+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 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
new file mode 100644
index 0000000..e46008a
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x64_dvd_unknown.lng
@@ -0,0 +1,2 @@
+[general]
+l10n-language=en_US
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
new file mode 100644
index 0000000..cb98a99
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GRMCNULFRER_EN_DVD
+Volume set id: GRMCNULFRER_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: 1088204
+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 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
new file mode 100644
index 0000000..e46008a
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_x86_dvd_unknown.lng
@@ -0,0 +1,2 @@
+[general]
+l10n-language=en_US
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
new file mode 100644
index 0000000..fbd56e0
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_unknown.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FRMCXFRE_EN_DVD
+Volume set id: FRMCXFRE_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: 1919276
+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 261 609
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
new file mode 100644
index 0000000..81aa52e
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_unknown.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FRMCFRE_EN_DVD
+Volume set id: FRMCFRE_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: 1506908
+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 264 612
--
1.8.5.3
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
