From 7c81f38a8010dcf756b8409f188e373089ec1180 Mon Sep 17 00:00:00 2001
From: daniceexi <wxp@cn.ibm.com>
Date: Mon, 16 Dec 2013 03:53:47 -0500
Subject: [PATCH] Enhanced postscript support in templates

---
 .../install/windows/enterprise.win2k8.x86_64.tmpl   |  8 ++++++++
 .../install/windows/enterprise.win2k8r2.x86_64.tmpl | 13 ++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
index d59b7ddb2..d138b4e7b 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
@@ -100,6 +100,14 @@
             </FirewallGroups>
         </component>
         <component name="Microsoft-Windows-Deployment" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <RunSynchronous>
+            <RunSynchronousCommand wcm:action="add">
+                <Description>StartPointOfPostscripts</Description>
+                <Order>50</Order>
+                <Path>cmd /c c:\xcatpost\xcatwinpost.vbs</Path>
+                <WillReboot>OnRequest</WillReboot>
+            </RunSynchronousCommand>
+        </RunSynchronous>
         </component>
         <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <ComputerName>#TABLE:nodelist:$NODE:node#</ComputerName>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
index 8aa88c41a..cf0435f60 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
@@ -14,11 +14,7 @@
         <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DiskConfiguration>
                 <WillShowUI>OnError</WillShowUI>
-                <Disk>
-                    <DiskID>==INSTALLTODISK==</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-		    ==BOOTPARTITIONS==
-                </Disk>
+                ==DISKCONFIG==
             </DiskConfiguration>
             <DynamicUpdate>
                 <Enable>false</Enable>
@@ -84,6 +80,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #WINNETCFG#
         #WINADJOIN#
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <fDenyTSConnections>false</fDenyTSConnections>
@@ -99,6 +96,12 @@
         </component>
         <component name="Microsoft-Windows-Deployment" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<RunSynchronous>
+            <RunSynchronousCommand wcm:action="add">
+                <Description>StartPointOfPostscripts</Description>
+                <Order>50</Order>
+                <Path>cmd /c c:\xcatpost\xcatwinpost.vbs</Path>
+                <WillReboot>OnRequest</WillReboot>
+            </RunSynchronousCommand>
 		#WINDISABLENULLADMIN#
 		</RunSynchronous>
         </component>