summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>2013-02-25 15:25:01 +0100
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>2013-03-01 17:46:43 +0200
commitbe28bd057664e4e59d41b9f6edc6ccf7b4052ea0 (patch)
treedf39ce961d8ff496aa73a824f118006765a374f9
parent00f1b82b0ed3bf48028983080508895a0a460a08 (diff)
installer,win7: Use post-installation script
Launch post-installation setup file, windows.cmd at the end of Windows 7 installation as well. This combined will previous patches in this series, enables out of the box installation of virtio, and QXL drivers and vdagent for apps making use of our post-installation drivers API (currently only Boxes).
-rw-r--r--data/install-scripts/windows-unattend.xml24
-rw-r--r--data/oses/windows.xml.in1
2 files changed, 25 insertions, 0 deletions
diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows-unattend.xml
index d4e1b98..73ea11d 100644
--- a/data/install-scripts/windows-unattend.xml
+++ b/data/install-scripts/windows-unattend.xml
@@ -232,6 +232,7 @@
<param name="target-disk" policy="optional"/>
<param name="pre-install-drivers-disk" policy="optional"/>
<param name="pre-install-drivers-location" policy="optional"/>
+ <param name="script-disk" policy="optional"/>
</config>
<template>
<xsl:stylesheet
@@ -251,6 +252,17 @@
</xsl:choose>
</xsl:template>
+ <xsl:template name="script-disk">
+ <xsl:choose>
+ <xsl:when test="config/script-disk != ''">
+ <xsl:value-of select="config/script-disk"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>A</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
<xsl:template name="arch">
<xsl:choose>
<xsl:when test="config/hardware-arch = 'x86_64'">
@@ -368,6 +380,18 @@
</xsl:attribute>
<ComputerName><xsl:value-of select="config/hostname"/></ComputerName>
</component>
+ <component name="Microsoft-Windows-Deployment" 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>
+ <RunSynchronous wcm:action="add">
+ <RunSynchronousCommand>
+ <Order>1</Order>
+ <Path>cmd /C A:\windows.cmd >c:\windows\osinfo.log 2>&amp;1</Path>
+ <Description>Post installation setup</Description>
+ </RunSynchronousCommand>
+ </RunSynchronous>
+ </component>
</settings>
</xsl:if>
<settings pass="oobeSystem">
diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 9a8de3a..b6d59e8 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -776,6 +776,7 @@
<installer>
<script id='http://microsoft.com/windows/unattend/jeos'/>
<script id='http://microsoft.com/windows/unattend/desktop'/>
+ <script id='http://microsoft.com/windows/cmd/desktop'/>
</installer>
<!-- virtio block device driver -->