[osinfo-db PATCH] Fix volume ID for windows media

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Microsoft has changed the rules for naming the volume ID
in their ISOs. This patch allows for more accurate detection
by tools like virt-manager.

---
 data/os/microsoft.com/win-10.xml.in     | 4 ++--
 data/os/microsoft.com/win-2k12.xml.in   | 6 +++---
 data/os/microsoft.com/win-2k12r2.xml.in | 8 ++++----
 data/os/microsoft.com/win-2k16.xml.in   | 6 +++---
 data/os/microsoft.com/win-8.1.xml.in    | 2 +-
 data/os/microsoft.com/win-8.xml.in      | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
index b82989c..c5da3e8 100644
--- a/data/os/microsoft.com/win-10.xml.in
+++ b/data/os/microsoft.com/win-10.xml.in
@@ -38,7 +38,7 @@
     <media arch="x86_64">
       <variant id="education"/>
       <iso>
-        <volume-id>(J_)?CEDN?A_X64FRE_</volume-id>
+        <volume-id>(J_)?CEDN?A_X64FREE?_</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>
@@ -108,7 +108,7 @@
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>(J_)?(CCSN?A|C?CCOMA)_X64FRE_</volume-id>
+        <volume-id>(J_)?(CCSN?A|C?CCOMA)_X64FREE?_</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/data/os/microsoft.com/win-2k12.xml.in b/data/os/microsoft.com/win-2k12.xml.in
index 7463ef4..b40ee11 100644
--- a/data/os/microsoft.com/win-2k12.xml.in
+++ b/data/os/microsoft.com/win-2k12.xml.in
@@ -33,7 +33,7 @@
 
     <media arch="x86_64">
       <iso>
-        <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FRE)_</volume-id>
+        <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FREE?)_</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>
@@ -42,7 +42,7 @@
     <media arch="x86_64">
       <variant id="essentials"/>
       <iso>
-        <volume-id>(HRM_SSSO_X64FRE)_</volume-id>
+        <volume-id>(HRM_SSSO_X64FREE?)_</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>
@@ -50,7 +50,7 @@
     <media arch="x86_64">
       <variant id="hyperv"/>
       <iso>
-        <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FRE)_</volume-id>
+        <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FREE?)_</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/data/os/microsoft.com/win-2k12r2.xml.in b/data/os/microsoft.com/win-2k12r2.xml.in
index b80db39..7bf7b9c 100644
--- a/data/os/microsoft.com/win-2k12r2.xml.in
+++ b/data/os/microsoft.com/win-2k12r2.xml.in
@@ -28,7 +28,7 @@
 
     <media arch="x86_64">
       <iso>
-        <volume-id>(IRM_SSS_X64FRE|IRM_SSS_X64CHK|IR3_SSS_X64FRE|IR5_SSS_X64FRE)_</volume-id>
+        <volume-id>(IRM_SSS_X64FREE?|IRM_SSS_X64CHK|IR3_SSS_X64FREE?|IR5_SSS_X64FREE?)_</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>
@@ -36,7 +36,7 @@
     <media arch="x86_64">
       <variant id="essentials"/>
       <iso>
-        <volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FRE|IRM_SSSO_X64FRE)_</volume-id>
+        <volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FREE?|IRM_SSSO_X64FREE?)_</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>
@@ -44,7 +44,7 @@
     <media arch="x86_64">
       <variant id="hyperv"/>
       <iso>
-        <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FRE)_</volume-id>
+        <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FREE?)_</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>
@@ -52,7 +52,7 @@
     <media arch="x86_64">
       <variant id="volume-licence"/>
       <iso>
-        <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV)_</volume-id>
+        <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV|IR1_SSS_X64FREV)_</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/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in
index 523733d..f3db328 100644
--- a/data/os/microsoft.com/win-2k16.xml.in
+++ b/data/os/microsoft.com/win-2k16.xml.in
@@ -19,7 +19,7 @@
 
     <media arch="x86_64">
       <iso>
-        <volume-id>^(SSS_X64CHK|SSS_X64FRE|SSS_X64FREE)_</volume-id>
+        <volume-id>^(SSS_X64CHK|SSS_X64FREE?)_</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>
@@ -27,7 +27,7 @@
     <media arch="x86_64">
       <variant id="essentials"/>
       <iso>
-        <volume-id>^(SESS_X64FRE)_</volume-id>
+        <volume-id>^(SESS_X64FREE?)_</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>
@@ -35,7 +35,7 @@
     <media arch="x86_64">
       <variant id="hyperv"/>
       <iso>
-        <volume-id>^(SHV_X64CHK|SHV_X64FRE)_</volume-id>
+        <volume-id>^(SHV_X64CHK|SHV_X64FREE?)_</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/data/os/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in
index a140f7e..9294ba0 100644
--- a/data/os/microsoft.com/win-8.1.xml.in
+++ b/data/os/microsoft.com/win-8.1.xml.in
@@ -108,7 +108,7 @@
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>(IR[M35]_CCSN?A_X64FRE)_</volume-id>
+        <volume-id>(IR[M35]_CCSN?A_X64FREE?)_</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/data/os/microsoft.com/win-8.xml.in b/data/os/microsoft.com/win-8.xml.in
index e4ae8a4..900eac4 100644
--- a/data/os/microsoft.com/win-8.xml.in
+++ b/data/os/microsoft.com/win-8.xml.in
@@ -36,7 +36,7 @@
     </media>
     <media arch="x86_64" installer-reboots="2">
       <iso>
-        <volume-id>(HB1_CCPA_X64FRE|HRM_CCSN?A_X64FRE)_</volume-id>
+        <volume-id>(HB1_CCPA_X64FREE?|HRM_CCSN?A_X64FREE?)_</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>
-- 
1.8.5.6

_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Fedora Users]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux