[Libosinfo] [PATCHv2 3/4] win7,installer: Adapt for Windows 8

[Christophe Fergeau]

On Wed, Feb 27, 2013 at 04:20:35PM +0200, Zeeshan Ali (Khattak) wrote:
> From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>
> 
> The presence of 'InstallFrom' in the XML breaks unattended installation
> for Windows 8 and its not needed for Windows 7 now that we require
> product key. 'ProductKey' is expected in different locations in the XML
> by Windows 8 but same location works for Windows 7 as well.
> ---
>  data/install-scripts/windows-unattend.xml | 45 +++++++++++--------------------
>  1 file changed, 16 insertions(+), 29 deletions(-)
> 
> diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows-unattend.xml
> index 743d918..3549cff 100644
> --- a/data/install-scripts/windows-unattend.xml
> +++ b/data/install-scripts/windows-unattend.xml
> @@ -198,15 +195,17 @@
>  		</FirstLogonCommands>
>  	      </component>
>  	    </settings>
> -	    <settings pass="specialize">
> -	      <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
> -		<xsl:attribute name="processorArchitecture">
> -		  <xsl:call-template name="arch"/>
> -		</xsl:attribute>
> +            <xsl:if test="os/version < 6.2">
> +	      <settings pass="specialize">
> +	        <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
> +		  <xsl:attribute name="processorArchitecture">
> +		    <xsl:call-template name="arch"/>
> +		  </xsl:attribute>
>  
> -		<ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
> -	      </component>
> -	    </settings>
> +		  <ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
> +	        </component>
> +	      </settings>
> +            </xsl:if>
>  	  </unattend>
>  	</xsl:template>
>        </xsl:stylesheet>

Forgot to explicitly say this in my previous email, I'd drop these 2 hunks
from the patch

> @@ -426,15 +422,6 @@
>           </xsl:if>
>          </component>
>         </settings>
> -       <settings pass="specialize">
> -        <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
> -         <xsl:attribute name="processorArchitecture">
> -          <xsl:call-template name="arch"/>
> -         </xsl:attribute>
> -
> -         <ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
> -        </component>
> -       </settings>
>        </unattend>
>       </xsl:template>
>      </xsl:stylesheet>

And this one (and the fact that they are different seems unwanted)

Christophe
-------------- 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/libosinfo/attachments/20130227/b80c8bea/attachment.sig>