[virt-tools-list] [PATCH] Import more Windows ISO signatures-v2

[Christophe Fergeau]

For what it's worth, this broke make check because a VolumeID went missing, pushing a fix for this.

Christophe

On Tue, May 22, 2012 at 04:58:26PM -0300, Fabiano Fidêncio wrote:
>     Based on: http://www.tacktech.com/Software.cfm
> ---
>  data/oses/windows.xml |   16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/data/oses/windows.xml b/data/oses/windows.xml
> index bcf0eb6..7dddd1e 100644
> --- a/data/oses/windows.xml
> +++ b/data/oses/windows.xml
> @@ -287,7 +287,7 @@
>  
>      <media arch="i386">
>        <iso>
> -        <volume-id>WIN2000</volume-id>
> +          <volume-id>(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)</volume-id>
>        </iso>
>      </media>
>  
> @@ -325,14 +325,14 @@
>  
>      <media arch="i386">
>        <iso>
> -        <volume-id>(GRTMPFPP|GRTMPVOL|MX2PFPP|VX2PFPP|MRMSD2|VX2PRMFPP|WXPFPP|X1APFPP|VRMSD2|XRMSD2)_</volume-id>
> +          <volume-id>(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_</volume-id>
>          <publisher-id>MICROSOFT CORPORATION</publisher-id>
>        </iso>
>      </media>
>  
>      <media arch="x86_64">
>        <iso>
> -        <volume-id>(AX2PXFPP)_</volume-id>
> +        <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXFPP)_</volume-id>
>          <publisher-id>MICROSOFT CORPORATION</publisher-id>
>        </iso>
>      </media>
> @@ -376,19 +376,19 @@
>  
>      <media arch="i386">
>        <iso>
> -        <volume-id>(NRMSFPP|ARMSFPP|ARMEFPP|CR0SP2)_</volume-id>
> +          <volume-id>(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_</volume-id>
>          <publisher-id>MICROSOFT CORPORATION</publisher-id>
>        </iso>
>      </media>
>      <media arch="x86_64">
>        <iso>
> -        <volume-id>(ARMSXFPP|ARMEXFPP|CR0SPX2)_</volume-id>
> +          <volume-id>(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_</volume-id>
>          <publisher-id>MICROSOFT CORPORATION</publisher-id>
>        </iso>
>      </media>
>      <media arch="ia64">
>        <iso>
> -        <volume-id>(CR0SPI2)_</volume-id>
> +        <volume-id>(ARMEIFPP|CR0SPI2)_</volume-id>
>          <publisher-id>MICROSOFT CORPORATION</publisher-id>
>        </iso>
>      </media>
> @@ -633,13 +633,13 @@
>  
>      <media arch="i386">
>        <iso>
> -        <volume-id>(GRMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL)_</volume-id>
> +        <volume-id>(GRMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER)_</volume-id>
>          <publisher-id>MICROSOFT CORPORATION</publisher-id>
>        </iso>
>      </media>
>      <media arch="x86_64">
>        <iso>
> -        <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GRMCENXVOL|GRMCNENXVOL)_</volume-id>
> +        <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER)_</volume-id>
>          <publisher-id>MICROSOFT CORPORATION</publisher-id>
>        </iso>
>      </media>
> -- 
> 1.7.10.1
> 
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list at redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/virt-tools-list/attachments/20120601/c1accd2b/attachment.sig>