Generalize volume-id to include 'N SP1' variant.
---
Pushed under trivial rule.
data/oses/windows.xml.in | 2 +-
...rofessional_n_with_sp1_x64_dvd_u_677207.iso.txt | 29 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 test/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 39d5b55..19dc349 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -769,7 +769,7 @@
<media arch="i686" installer-reboots="2">
<variant id="professional"/>
<iso>
- <volume-id>(GSP1RMCNPRFRER|GSP1RMCPRFRER|GSP1RMCPRVOL)_</volume-id>
+ <volume-id>(GSP1RMCNPRFRER|GSP1RMCN*PRX*FRER|GSP1RMCPRVOL)_</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_professional_n_with_sp1_x64_dvd_u_677207.iso.txt b/test/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
new file mode 100644
index 0000000..438d4d5
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_professional_n_with_sp1_x64_dvd_u_677207.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: GSP1RMCNPRXFRER_EN_DVD
+Volume set id: GSP1RMCNPRXFRER_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: 1452418
+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
--
1.9.0
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
