[Libosinfo] [PATCH] Add Windows 10 Education volume-id

[Christophe Fergeau]

---
 data/oses/windows.xml.in                           | 49 ++++++++++++++++++++++
 ...en_windows_10_education_x86_dvd_6848121.iso.txt | 29 +++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index a06d18a..0ab5cd1 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -1059,4 +1059,53 @@
     </media>
   </os>
 
+  <os id="http://microsoft.com/win/10">
+    <short-id>win10</short-id>
+    <_name>Microsoft Windows 10</_name>
+    <version>10.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/8.1"/>
+    <upgrades id="http://microsoft.com/win/8.1"/>
+
+    <release-date>2015-07-29</release-date>
+
+    <variant id="education">
+      <_name>Microsoft Windows 10 Education</_name>
+    </variant>
+
+    <!-- Education -->
+    <media arch="x86_64">
+      <variant id="education"/>
+      <iso>
+        <volume-id>J_CEDA_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>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
+    </devices>
+  </os>
+
 </libosinfo>
diff --git a/test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt b/test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
new file mode 100644
index 0000000..f9b0ce5
--- /dev/null
+++ b/test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: J_CEDA_X86FRE_EN-US_DV5
+Volume set id: J_CEDA_X86FRE_EN-US_DV5
+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: 1426630
+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 222 546
-- 
2.4.3