From bc33e681e08dfcbd16850883c55a32f3f2c559fb Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 24 Jan 2013 19:10:40 +0000
Subject: [PATCH] Fix incorrect partition id in the Win2012 Datacenter template
 Correct the disable local admin XML from Template.pm

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14987 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/Template.pm                  | 10 ++++------
 .../install/windows/datacenter.win2012.x86_64.tmpl     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 3fe022ece..6151ddbd6 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -265,12 +265,10 @@ sub subvars {
 sub windows_disable_null_admin { 
 #in the event where windows_account_data has not set an administrator user, we explicitly disable the administrator user 
 	unless ($localadminenabled) {
-		return '
-                <RunSynchronousCommand wcm:action=\"add\">
-                       <Order>100</Order>
-                       <Path>cmd /c %systemroot%\system32\net.exe user Administrator /active:no</Path>
-               </RunSynchronousCommand>
-';
+		return "<RunSynchronousCommand wcm:action=\"add\">\r
+                       <Order>100</Order>\r
+                       <Path>cmd /c %systemroot%\\system32\\net.exe user Administrator /active:no</Path>\r
+               </RunSynchronousCommand>";
 	}
 	return "";
 }
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 9f6a45654..4df730aed 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
@@ -33,7 +33,7 @@
                 <OSImage>
                     <InstallTo>
                         <DiskID>0</DiskID>
-                        <PartitionID>3</PartitionID>
+                        <PartitionID>1</PartitionID>
                     </InstallTo>
                     <InstallFrom>
                         <MetaData wcm:action="add">