From 80b9ada6a6e351f48c8949fa6bd97c57d0460c2d Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 10 Jan 2013 20:30:20 +0000
Subject: [PATCH] Make use of new WINADJOIN Template directive to simplify
 number of windows templates moving forward

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14854 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/install/windows/datacenter.win2012.x86_64.tmpl    | 1 +
 .../xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi     | 1 +
 .../share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl | 1 +
 .../xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi  | 1 +
 .../share/xcat/install/windows/standard.win2012.x86_64.tmpl      | 1 +
 .../share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi | 1 +
 6 files changed, 6 insertions(+)

diff --git a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
index 7a7702557..08569fe28 100644
--- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
@@ -91,6 +91,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #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>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
index f4a87d3f6..070cc9255 100644
--- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
@@ -103,6 +103,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #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>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl
index f78d71158..52d37ea1d 100644
--- a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl
@@ -90,6 +90,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #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>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi
index 26827488c..9928fca3b 100644
--- a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi
@@ -100,6 +100,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #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>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
index 0c428746b..f208d2040 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
@@ -91,6 +91,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #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>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
index c0c7a68df..d189ecb6f 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
@@ -101,6 +101,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #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>
         </component>