I'd tend to merge 6/7 and 7/7. I assume make check is still passing after this change (ie we did not lose any media match in the process). On Thu, Nov 28, 2013 at 01:07:17AM +0000, Zeeshan Ali (Khattak) wrote: > --- > data/oses/windows.xml.in | 69 ++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 67 insertions(+), 2 deletions(-) > > diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in > index f62595a..35efb59 100644 > --- a/data/oses/windows.xml.in > +++ b/data/oses/windows.xml.in > @@ -755,16 +755,81 @@ > <_name>Microsoft Windows 7 Ultimate</_name> > </variant> > > + <!-- Home Premium --> > + <media arch="x86_64" installer-reboots="2"> > + <variant id="home-premium"/> > + <iso> > + <volume-id>(GSP1RMCNHPXFRER)_</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> > + > + <!-- Professional --> > + <media arch="i686" installer-reboots="2"> > + <variant id="professional"/> > + <iso> > + <volume-id>(GSP1RMCNPRFRER|GSP1RMCPRFRER|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> > + </media> > + <media arch="x86_64" installer-reboots="2"> > + <variant id="professional"/> > + <iso> > + <volume-id>(GSP1RMCPRXFRER|GSP1RMCPRXVOL)_</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> > + > + <!-- Enterprise --> > + <media arch="i686" installer-reboots="2"> > + <variant id="enterprise"/> > + <iso> > + <volume-id>(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL)_</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" installer-reboots="2"> > + <variant id="enterprise"/> > + <iso> > + <volume-id>(GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL)_</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> > + > + <!-- Ultimate --> > + <media arch="i686" installer-reboots="2"> > + <variant id="ultimate"/> > + <iso> > + <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER)_</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" installer-reboots="2"> > + <variant id="ultimate"/> > + <iso> > + <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER)_</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> > + > + <!-- Variant unknown --> > <media arch="i686" installer-reboots="2"> > <iso> > - <volume-id>(GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER|GSP1RMCPRVOL|GSP1RMCNENVOL)_</volume-id> > + <volume-id>(GRMCPRFRER)_</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" installer-reboots="2"> > <iso> > - <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GRMCXCHK|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL|GSP1RMCNULXFRER)_</volume-id> > + <volume-id>(GRMCHPXFRER|GRMCXCHK|GRMCPRXFRER)_</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> > -- > 1.8.4.2 > > _______________________________________________ > Libosinfo mailing list > Libosinfo@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/libosinfo
Attachment:
pgpjVkyND5QCu.pgp
Description: PGP signature
_______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
