On Fri, Feb 02, 2018 at 12:24:43PM +0100, Felipe Borges wrote:
> https://docs.microsoft.com/en-us/windows-server/get-started/server-basics
> ---
>  data/os/microsoft.com/win-2k16.xml.in | 60 
> +++++++++++++++++++++++++++++++++++
>  1 file changed, 60 insertions(+)
>  create mode 100644 data/os/microsoft.com/win-2k16.xml.in
> 
> diff --git a/data/os/microsoft.com/win-2k16.xml.in 
> b/data/os/microsoft.com/win-2k16.xml.in
> new file mode 100644
> index 0000000..48bf5e3
> --- /dev/null
> +++ b/data/os/microsoft.com/win-2k16.xml.in
> @@ -0,0 +1,60 @@
> +<libosinfo version="0.0.1">
> +<!-- Licensed under the GNU General Public License version 2 or later.
> +     See http://www.gnu.org/licenses/ for a copy of the license text -->
> +  <os id="http://microsoft.com/win/2k16";>
> +    <short-id>win2k16</short-id>
> +    <_name>Microsoft Windows Server 2016</_name>
> +    <version>1709</version>
> +    <_vendor>Microsoft Corporation</_vendor>
> +    <family>winnt</family>
> +    <distro>win</distro>
> +    <derives-from id="http://microsoft.com/win/2k12r2"/>
> +    <upgrades id="http://microsoft.com/win/2k12r2"/>
> +
> +    <variant id="hyperv">
> +      <_name>Windows Server 2016 for HyperV</_name>
> +    </variant>
> +
> +    <release-date>2017-10-17</release-date>
> +
> +    <media arch="x86_64">
> +      <iso>
> +        <volume-id>(SSS_X64CHK|SSS_X64FRE|SSS_X64FREE)_</volume-id>

You'll need to anchor the regexp to the start of the string as there are
win2k12 isos with:
HRM_SSS_X64FREV_EN-US_DV5

> +        <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">
> +      <variant id="essentials"/>
> +      <iso>
> +        <volume-id>()_</volume-id>

This looks like this a leftover?

> +        <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">
> +      <variant id="hyperv"/>
> +      <iso>
> +        <volume-id>(SHV_X64CHK|SHV_X64FRE)_</volume-id>

Same comment regarding using ^(SHV...)_ instead.

Christophe

Attachment: signature.asc
Description: PGP signature

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

Reply via email to