diff --git a/xCAT-server/lib/xcat/plugins/windows.pm b/xCAT-server/lib/xcat/plugins/windows.pm index 7019c442f..823f6a940 100644 --- a/xCAT-server/lib/xcat/plugins/windows.pm +++ b/xCAT-server/lib/xcat/plugins/windows.pm @@ -12,6 +12,7 @@ use xCAT::Table; use xCAT::Utils; use xCAT::TableUtils; use xCAT::SvrUtils; +use File::stat; use Socket; use xCAT::MsgUtils; use Data::Dumper; @@ -335,26 +336,24 @@ sub mkinstall #Call the Template class to do substitution to produce an unattend.xml file in the autoinst dir my $tmperr; + unless (-r "$installdir/utils/windows/fixupunattend.vbs" and stat("$::XCATROOT/share/xcat/netboot/windows/fixupunattend.vbs")->mtime < stat("$installdir/utils/windows/fixupunattend.vbs")) { + mkpath("$installdir/utils/windows/"); + copy("$::XCATROOT/share/xcat/netboot/windows/fixupunattend.vbs","$installdir/utils/windows/fixupunattend.vbs"); + } + unless (-r "$installdir/utils/windows/detectefi.exe" and stat("$::XCATROOT/share/xcat/netboot/windows/detectefi.exe")->mtime < stat("$installdir/utils/windows/detectefi.exe")) { + mkpath("$installdir/utils/windows/"); + copy("$::XCATROOT/share/xcat/netboot/windows/detectefi.exe","$installdir/utils/windows/detectefi.exe"); + } if (-r "$tmplfile") { $tmperr = xCAT::Template->subvars( $tmplfile, - "$installroot/autoinst/$node", + "$installroot/autoinst/$node.xml", $node, 0 ); } - if (-r "$tmplfile.uefi") - { - $tmperr = - xCAT::Template->subvars( - $tmplfile.".uefi", - "$installroot/autoinst/$node.uefi", - $node, - 0, undef,undef,reusemachinepass=>1, - ); - } if ($tmperr) { @@ -421,17 +420,13 @@ sub mkinstall copy("$::XCATROOT/share/xcat/netboot/detectefi.exe","$installroot/utils/detectefi.exe"); } open($shandle,">","$installroot/autoinst/$node.cmd"); - print $shandle "set UNATTEND=$node\r\n"; - if (-f "$installroot/utils/detectefi.exe") { - print $shandle "i:\\utils\\detectefi.exe\r\n"; - print $shandle "if NOT ERRORLEVEL 1 set UNATTEND=$node.uefi\r\n"; - } + print $shandle "i:\\utils\\windows\\fixupunattend.vbs $node.xml x:\\unattend.xml\r\n"; if ($sspeed) { $sport++; - print $shandle "i:\\$os\\$arch\\setup /unattend:i:\\autoinst\\%UNATTEND% /emsport:COM$sport /emsbaudrate:$sspeed /noreboot\r\n"; + print $shandle "i:\\$os\\$arch\\setup /unattend:x:\\unattend.xml /emsport:COM$sport /emsbaudrate:$sspeed /noreboot\r\n"; } else { - print $shandle "i:\\$os\\$arch\\setup /unattend:i:\\autoinst\\%UNATTEND% /noreboot\r\n"; + print $shandle "i:\\$os\\$arch\\setup /unattend:x:\\unattend.xml /noreboot\r\n"; } #print $shandle "i:\\postscripts\ print $shandle 'reg load HKLM\csystem c:\windows\system32\config\system'."\r\n"; #copy installer DUID to system before boot diff --git a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl b/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl index 0ff886021..2a7be74be 100644 --- a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl +++ b/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl @@ -15,15 +15,9 @@ OnError - 0 + ==INSTALLTODISK== true - - - 1 - Primary - true - - + ==BOOTPARTITIONS== @@ -32,8 +26,8 @@ - 0 - 1 + ==INSTALLTODISK== + ==INSTALLTOPART== @@ -52,7 +46,7 @@ - I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# + ==INSTALLSHARE==\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# diff --git a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl.uefi deleted file mode 100644 index c847e7b03..000000000 --- a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl.uefi +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - en-US - - en-US - en-US - en-US - 0409:00000409 - - - - OnError - - 0 - true - - - 1 - EFI - 260 - - - 2 - MSR - 128 - - - 3 - Primary - true - - - - - - false - - - - - 0 - 3 - - - - /IMAGE/NAME - Hyper-V Server 2012 SERVERHYPERCORE - - - - - - true - - - - - - - - I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# - - - - - - - - 32 - 1024 - 768 - - - true - 1 - false - false - - - - - #WINACCOUNTDATA# - - - - - - - 32 - 1024 - 768 - - - - - #WINADJOIN# - - false - - - 0 - - - - - true - Remote Desktop - all - - - - - - #WINDISABLENULLADMIN# - - - - #TABLE:nodelist:$NODE:node# - #WINTIMEZONE# - - - - - 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 791a703fc..476c6789b 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 @@ -15,15 +15,9 @@ OnError - 0 + ==INSTALLTODISK== true - - - 1 - Primary - true - - + ==BOOTPARTITIONS== @@ -32,8 +26,8 @@ - 0 - 1 + ==INSTALLTODISK== + ==INSTALLTOPART== @@ -53,7 +47,7 @@ - I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# + ==INSTALLSHARE==\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# 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 deleted file mode 100644 index 028be4043..000000000 --- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - en-US - - en-US - en-US - en-US - 0409:00000409 - - - - OnError - - 0 - true - - - 1 - EFI - 260 - - - 2 - MSR - 128 - - - 3 - Primary - true - - - - - - false - - - - - 0 - 3 - - - - /IMAGE/NAME - Windows Server 2012 SERVERDATACENTER - - - - - - true - #WINPRODKEY:win2012.datacenter# - - - - - - - - I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# - - - - - - - - 32 - 1024 - 768 - - - true - 1 - false - false - - - - - #WINACCOUNTDATA# - - - - - - - 32 - 1024 - 768 - - - - - #WINADJOIN# - - false - - - 0 - - - - - true - Remote Desktop - all - - - - - - #WINDISABLENULLADMIN# - - - - #TABLE:nodelist:$NODE:node# - #WINTIMEZONE# - - - - - 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 aa460d47a..7a90b4e27 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 @@ -15,15 +15,9 @@ OnError - 0 + ==INSTALLTODISK== true - - - 1 - Primary - true - - + ==BOOTPARTITIONS== @@ -32,7 +26,7 @@ - 0 + ==INSTALLTODISK== 1 @@ -58,7 +52,7 @@ - I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# + ==INSTALLSHARE==\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# @@ -119,5 +113,4 @@ - 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 230b0fab8..90d9b645e 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 @@ -15,15 +15,9 @@ OnError - 0 + ==INSTALLTODISK== true - - - 1 - Primary - true - - + ==BOOTPARTITIONS== @@ -32,8 +26,8 @@ - 0 - 1 + ==INSTALLTODISK== + INSTALLTOPART== @@ -47,6 +41,7 @@ true xCAT USER xCAT + #WINPRODKEY:win2k8r2.enterprise# @@ -54,7 +49,7 @@ - I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# + ==INSTALLSHARE==\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch# @@ -75,10 +70,7 @@ - - #TABLE:passwd:key=system,username=Administrator:password# - true</PlainText> - </AdministratorPassword> + #WINACCOUNTDATA# </UserAccounts> </component> </settings> @@ -92,6 +84,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> @@ -108,14 +101,15 @@ </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> + #WINDISABLENULLADMIN# + </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> <TimeZone>#WINTIMEZONE#</TimeZone> - <ProductKey>#TABLE:prodkey:$NODE,product=win2k8r2.enterprise:key#</ProductKey> </component> </settings> <settings pass="auditSystem"> </settings> - <cpi:offlineImage cpi:source="wim:i:/win2k8r2/x86_64/sources/install.wim#Windows Server 2008 R2 SERVERENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> </unattend> diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi deleted file mode 100644 index aee08c8a8..000000000 --- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" 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"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <UserLocale>en-US</UserLocale> - <UILanguage>en-US</UILanguage> - <SystemLocale>en-US</SystemLocale> - <InputLocale>0409:00000409</InputLocale> - </component> - <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>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - <CreatePartitions> - <CreatePartition> - <Order>1</Order> - <Type>EFI</Type> - <Size>50</Size> - </CreatePartition> - <CreatePartition> - <Order>2</Order> - <Type>MSR</Type> - <Size>128</Size> - </CreatePartition> - <CreatePartition> - <Order>3</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - </Disk> - </DiskConfiguration> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>3</PartitionID> - </InstallTo> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/INDEX</Key> - <Value>3</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>xCAT USER</FullName> - <Organization>xCAT</Organization> - </UserData> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path> - </PathAndCredentials> - </DriverPaths> - </component> - </settings> - <settings pass="oobeSystem"> - <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"> - <Display> - <ColorDepth>32</ColorDepth> - <HorizontalResolution>1024</HorizontalResolution> - <VerticalResolution>768</VerticalResolution> - </Display> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <ProtectYourPC>1</ProtectYourPC> - <SkipMachineOOBE>false</SkipMachineOOBE> - <SkipUserOOBE>false</SkipUserOOBE> - </OOBE> - <FirstLogonCommands> - </FirstLogonCommands> - <UserAccounts> - <AdministratorPassword> - <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value> - <PlainText>true</PlainText> - </AdministratorPassword> - </UserAccounts> - </component> - </settings> - <settings pass="auditUser"> - <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"> - <Display> - <ColorDepth>32</ColorDepth> - <HorizontalResolution>1024</HorizontalResolution> - <VerticalResolution>768</VerticalResolution> - </Display> - </component> - </settings> - <settings pass="specialize"> - <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> - <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" 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"> - <UserAuthentication>0</UserAuthentication> - </component> - <component name="Networking-MPSSVC-Svc" 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"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop"> - <Active>true</Active> - <Group>Remote Desktop</Group> - <Profile>all</Profile> - </FirewallGroup> - </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"> - </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> - <TimeZone>#WINTIMEZONE#</TimeZone> - <ProductKey>#TABLE:prodkey:$NODE,product=win2k8r2.enterprise:key#</ProductKey> - </component> - </settings> - <settings pass="auditSystem"> - </settings> - <cpi:offlineImage cpi:source="wim:i:/win2k8r2/x86_64/sources/install.wim#Windows Server 2008 R2 SERVERENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl index e3ccd00c7..2d7ef8086 100755 --- a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl +++ b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl @@ -12,14 +12,8 @@ <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> <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <DiskID>0</DiskID> + <DiskID>==INSTALLTODISK==</DiskID> + ==BOOTPARTITIONS== <WillWipeDisk>true</WillWipeDisk> </Disk> <WillShowUI>OnError</WillShowUI> @@ -33,26 +27,19 @@ </MetaData> </InstallFrom> <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> + <DiskID>==INSTALLTODISK==</DiskID> + <PartitionID>==INSTALLTOPART==</PartitionID> </InstallTo> </OSImage> </ImageInstall> <UserData> <AcceptEula>true</AcceptEula> - <FullName>xCAT USER</FullName> - <Organization>xCAT</Organization> + #WINPRODKEY:win7.enterprise# </UserData> </component> </settings> <settings pass="specialize"> - <component name="Microsoft-Windows-UnattendedJoin" 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"> - <Identification> - <JoinDomain>#TABLE:site:key=domain:value#</JoinDomain> - <MachinePassword>#MACHINEPASSWORD#</MachinePassword> - <UnsecureJoin>true</UnsecureJoin> - </Identification> - </component> + #WINADJOIN# <component name="Microsoft-Windows-Security-SPP-UX" 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"> <SkipAutoActivation>true</SkipAutoActivation> </component> @@ -68,6 +55,11 @@ </FirewallGroup> </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> + #WINDISABLENULLADMIN# + </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> <TimeZone>#WINTIMEZONE#</TimeZone> @@ -77,7 +69,7 @@ <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>i:\drivers\win7\x86_64</Path> + <Path>==INSTALLSHARE==\drivers\win7\x86_64</Path> </PathAndCredentials> </DriverPaths> </component> @@ -91,17 +83,8 @@ </OOBE> <UserAccounts> - <DomainAccounts> - <DomainAccountList wcm:action="add"> - <DomainAccount wcm:action="add"> - <Group>Administrators</Group> - <Name>Domain Admins</Name> - </DomainAccount> - <Domain>#TABLE:site:key=domain:value#</Domain> - </DomainAccountList> - </DomainAccounts> + #WINACCOUNTDATA# </UserAccounts> </component> </settings> - <cpi:offlineImage cpi:source="wim://172.16.0.1/install/win7/x86_64/sources/install.wim#Windows 7 ENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> </unattend> diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi deleted file mode 100755 index 33a4325d9..000000000 --- a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" 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"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>0409:00000409</InputLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <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> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>EFI</Type> - <Size>50</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Type>MSR</Type> - <Size>128</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>3</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 7 ENTERPRISE</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>3</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>xCAT USER</FullName> - <Organization>xCAT</Organization> - </UserData> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-UnattendedJoin" 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"> - <Identification> - <JoinDomain>#TABLE:site:key=domain:value#</JoinDomain> - <MachinePassword>#MACHINEPASSWORD#</MachinePassword> - <UnsecureJoin>true</UnsecureJoin> - </Identification> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" 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"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - <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> - <component name="Networking-MPSSVC-Svc" 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"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop"> - <Active>true</Active> - <Group>Remote Desktop</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </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> - <TimeZone>#WINTIMEZONE#</TimeZone> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>i:\drivers\win7\x86_64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - </settings> - <settings pass="oobeSystem"> - <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"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <NetworkLocation>Other</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - - </OOBE> - <UserAccounts> - <DomainAccounts> - <DomainAccountList wcm:action="add"> - <DomainAccount wcm:action="add"> - <Group>Administrators</Group> - <Name>Domain Admins</Name> - </DomainAccount> - <Domain>#TABLE:site:key=domain:value#</Domain> - </DomainAccountList> - </DomainAccounts> - </UserAccounts> - </component> - </settings> - <cpi:offlineImage cpi:source="wim://172.16.0.1/install/win7/x86_64/sources/install.wim#Windows 7 ENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl index 8c2ee4315..f1dcc37e8 100755 --- a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl +++ b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl @@ -12,14 +12,8 @@ <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> <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <DiskID>0</DiskID> + ==BOOTPARTITIONS== + <DiskID>==INSTALLTODISK==</DiskID> <WillWipeDisk>true</WillWipeDisk> </Disk> <WillShowUI>OnError</WillShowUI> @@ -33,26 +27,19 @@ </MetaData> </InstallFrom> <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> + <DiskID>==INSTALLTODISK==</DiskID> + <PartitionID>==INSTALLTOPART==</PartitionID> </InstallTo> </OSImage> </ImageInstall> <UserData> <AcceptEula>true</AcceptEula> - <FullName>xCAT USER</FullName> - <Organization>xCAT</Organization> + #WINPRODKEY:win8.enterprise# </UserData> </component> </settings> <settings pass="specialize"> - <component name="Microsoft-Windows-UnattendedJoin" 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"> - <Identification> - <JoinDomain>#TABLE:site:key=domain:value#</JoinDomain> - <MachinePassword>#MACHINEPASSWORD#</MachinePassword> - <UnsecureJoin>true</UnsecureJoin> - </Identification> - </component> + #WINADJOIN# <component name="Microsoft-Windows-Security-SPP-UX" 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"> <SkipAutoActivation>true</SkipAutoActivation> </component> @@ -68,6 +55,11 @@ </FirewallGroup> </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> + #WINDISABLENULLADMIN# + </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> <TimeZone>#WINTIMEZONE#</TimeZone> @@ -77,7 +69,7 @@ <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>i:\drivers\win7\x86_64</Path> + <Path>==INSTALLSHARE==\drivers\win8\x86_64</Path> </PathAndCredentials> </DriverPaths> </component> @@ -91,17 +83,8 @@ </OOBE> <UserAccounts> - <DomainAccounts> - <DomainAccountList wcm:action="add"> - <DomainAccount wcm:action="add"> - <Group>Administrators</Group> - <Name>Domain Admins</Name> - </DomainAccount> - <Domain>#TABLE:site:key=domain:value#</Domain> - </DomainAccountList> - </DomainAccounts> + #WINACCOUNTDATA# </UserAccounts> </component> </settings> - <cpi:offlineImage cpi:source="wim://172.16.0.1/install/win7/x86_64/sources/install.wim#Windows 8 Enterprise" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> </unattend> diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi deleted file mode 100755 index c9c2b05fe..000000000 --- a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" 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"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <InputLocale>0409:00000409</InputLocale> - <UILanguage>en-US</UILanguage> - <UserLocale>en-US</UserLocale> - </component> - <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> - <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>EFI</Type> - <Size>50</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>2</Order> - <Type>MSR</Type> - <Size>128</Size> - </CreatePartition> - <CreatePartition wcm:action="add"> - <Order>3</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <DiskID>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - </Disk> - <WillShowUI>OnError</WillShowUI> - </DiskConfiguration> - <ImageInstall> - <OSImage> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows 8 Enterprise</Value> - </MetaData> - </InstallFrom> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>3</PartitionID> - </InstallTo> - </OSImage> - </ImageInstall> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>xCAT USER</FullName> - <Organization>xCAT</Organization> - </UserData> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-UnattendedJoin" 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"> - <Identification> - <JoinDomain>#TABLE:site:key=domain:value#</JoinDomain> - <MachinePassword>#MACHINEPASSWORD#</MachinePassword> - <UnsecureJoin>true</UnsecureJoin> - </Identification> - </component> - <component name="Microsoft-Windows-Security-SPP-UX" 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"> - <SkipAutoActivation>true</SkipAutoActivation> - </component> - <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> - <component name="Networking-MPSSVC-Svc" 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"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop"> - <Active>true</Active> - <Group>Remote Desktop</Group> - <Profile>all</Profile> - </FirewallGroup> - </FirewallGroups> - </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> - <TimeZone>#WINTIMEZONE#</TimeZone> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>i:\drivers\win7\x86_64</Path> - </PathAndCredentials> - </DriverPaths> - </component> - </settings> - <settings pass="oobeSystem"> - <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"> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <NetworkLocation>Other</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - - </OOBE> - <UserAccounts> - <DomainAccounts> - <DomainAccountList wcm:action="add"> - <DomainAccount wcm:action="add"> - <Group>Administrators</Group> - <Name>Domain Admins</Name> - </DomainAccount> - <Domain>#TABLE:site:key=domain:value#</Domain> - </DomainAccountList> - </DomainAccounts> - </UserAccounts> - </component> - </settings> - <cpi:offlineImage cpi:source="wim://172.16.0.1/install/win7/x86_64/sources/install.wim#Windows 8 Enterprise" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> diff --git a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl index 181dbcc55..e5fce6997 100644 --- a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl +++ b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl @@ -15,15 +15,9 @@ <DiskConfiguration> <WillShowUI>OnError</WillShowUI> <Disk> - <DiskID>0</DiskID> + <DiskID>==INSTALLTODISK==</DiskID> <WillWipeDisk>true</WillWipeDisk> - <CreatePartitions> - <CreatePartition> - <Order>1</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> + ==BOOTPARTITIONS== </Disk> </DiskConfiguration> <DynamicUpdate> @@ -32,8 +26,8 @@ <ImageInstall> <OSImage> <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> + <DiskID>==INSTALLTODISK==</DiskID> + <PartitionID>==INSTALLTOPART==</PartitionID> </InstallTo> <InstallFrom> <MetaData wcm:action="add"> @@ -54,7 +48,7 @@ <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path> + <Path>==INSTALLSHARE==\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path> </PathAndCredentials> </DriverPaths> </component> @@ -134,5 +128,4 @@ </settings> <settings pass="auditSystem"> </settings> - <cpi:offlineImage cpi:source="wim:i:/win2k8r2/x86_64/sources/install.wim#Windows Server 2008 R2 SERVERENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> </unattend> diff --git a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi deleted file mode 100644 index 3927a90d2..000000000 --- a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi +++ /dev/null @@ -1,148 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" 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"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <UserLocale>en-US</UserLocale> - <UILanguage>en-US</UILanguage> - <SystemLocale>en-US</SystemLocale> - <InputLocale>0409:00000409</InputLocale> - </component> - <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>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - <CreatePartitions> - <CreatePartition> - <Order>1</Order> - <Type>EFI</Type> - <Size>50</Size> - </CreatePartition> - <CreatePartition> - <Order>2</Order> - <Type>MSR</Type> - <Size>128</Size> - </CreatePartition> - <CreatePartition> - <Order>3</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - </Disk> - </DiskConfiguration> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>3</PartitionID> - </InstallTo> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/INDEX</Key> - <Value>3</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - <UserData> - <AcceptEula>true</AcceptEula> - <FullName>xCAT USER</FullName> - <Organization>xCAT</Organization> - </UserData> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path> - </PathAndCredentials> - </DriverPaths> - </component> - </settings> - <settings pass="oobeSystem"> - <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"> - <Display> - <ColorDepth>32</ColorDepth> - <HorizontalResolution>1024</HorizontalResolution> - <VerticalResolution>768</VerticalResolution> - </Display> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <ProtectYourPC>1</ProtectYourPC> - <SkipMachineOOBE>false</SkipMachineOOBE> - <SkipUserOOBE>false</SkipUserOOBE> - </OOBE> - <FirstLogonCommands> - </FirstLogonCommands> - <UserAccounts> - <DomainAccounts> - <DomainAccountList> - <DomainAccount wcm:action="add"> - <Group>Administrators</Group> - <Name>Domain Admins</Name> - </DomainAccount> - <Domain>#TABLE:site:key=domain:value#</Domain> - </DomainAccountList> - </DomainAccounts> - </UserAccounts> - </component> - </settings> - <settings pass="auditUser"> - <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"> - <Display> - <ColorDepth>32</ColorDepth> - <HorizontalResolution>1024</HorizontalResolution> - <VerticalResolution>768</VerticalResolution> - </Display> - </component> - </settings> - <settings pass="specialize"> - <component name="Microsoft-Windows-UnattendedJoin" 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"> - <Identification> - <JoinDomain>#TABLE:site:key=domain:value#</JoinDomain> - <MachinePassword>#MACHINEPASSWORD#</MachinePassword> - <UnsecureJoin>true</UnsecureJoin> - </Identification> - </component> - <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> - <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" 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"> - <UserAuthentication>0</UserAuthentication> - </component> - <component name="Networking-MPSSVC-Svc" 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"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop"> - <Active>true</Active> - <Group>Remote Desktop</Group> - <Profile>all</Profile> - </FirewallGroup> - </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"> - <Order>100</Order> - <Path>cmd /c %systemroot%\system32\net.exe user Administrator /active:no</Path> - </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> - <TimeZone>#WINTIMEZONE#</TimeZone> - </component> - </settings> - <settings pass="auditSystem"> - </settings> - <cpi:offlineImage cpi:source="wim:i:/win2k8r2/x86_64/sources/install.wim#Windows Server 2008 R2 SERVERENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> -</unattend> 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 0b6093e38..71cd0da07 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 @@ -15,15 +15,9 @@ <DiskConfiguration> <WillShowUI>OnError</WillShowUI> <Disk> - <DiskID>0</DiskID> + <DiskID>==INSTALLTODISK==</DiskID> <WillWipeDisk>true</WillWipeDisk> - <CreatePartitions> - <CreatePartition> - <Order>1</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> + ==BOOTPARTITIONS== </Disk> </DiskConfiguration> <DynamicUpdate> @@ -32,8 +26,8 @@ <ImageInstall> <OSImage> <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> + <DiskID>==INSTALLTODISK==</DiskID> + <PartitionID>==INSTALLTOPART==</PartitionID> </InstallTo> <InstallFrom> <MetaData wcm:action="add"> @@ -53,7 +47,7 @@ <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path> + <Path>==INSTALLSHARE==\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path> </PathAndCredentials> </DriverPaths> </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 deleted file mode 100644 index 14a3c3241..000000000 --- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<unattend xmlns="urn:schemas-microsoft-com:unattend"> - <servicing></servicing> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" 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"> - <SetupUILanguage> - <UILanguage>en-US</UILanguage> - </SetupUILanguage> - <UserLocale>en-US</UserLocale> - <UILanguage>en-US</UILanguage> - <SystemLocale>en-US</SystemLocale> - <InputLocale>0409:00000409</InputLocale> - </component> - <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>0</DiskID> - <WillWipeDisk>true</WillWipeDisk> - <CreatePartitions> - <CreatePartition> - <Order>1</Order> - <Type>EFI</Type> - <Size>260</Size> - </CreatePartition> - <CreatePartition> - <Order>2</Order> - <Type>MSR</Type> - <Size>128</Size> - </CreatePartition> - <CreatePartition> - <Order>3</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - </Disk> - </DiskConfiguration> - <DynamicUpdate> - <Enable>false</Enable> - </DynamicUpdate> - <ImageInstall> - <OSImage> - <InstallTo> - <DiskID>0</DiskID> - <PartitionID>3</PartitionID> - </InstallTo> - <InstallFrom> - <MetaData wcm:action="add"> - <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 SERVERSTANDARD</Value> - </MetaData> - </InstallFrom> - </OSImage> - </ImageInstall> - <UserData> - <AcceptEula>true</AcceptEula> - #WINPRODKEY:win2012.standard# - </UserData> - </component> - </settings> - <settings pass="offlineServicing"> - <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> - <DriverPaths> - <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path> - </PathAndCredentials> - </DriverPaths> - </component> - </settings> - <settings pass="oobeSystem"> - <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"> - <Display> - <ColorDepth>32</ColorDepth> - <HorizontalResolution>1024</HorizontalResolution> - <VerticalResolution>768</VerticalResolution> - </Display> - <OOBE> - <HideEULAPage>true</HideEULAPage> - <ProtectYourPC>1</ProtectYourPC> - <SkipMachineOOBE>false</SkipMachineOOBE> - <SkipUserOOBE>false</SkipUserOOBE> - </OOBE> - <FirstLogonCommands> - </FirstLogonCommands> - <UserAccounts> - #WINACCOUNTDATA# - </UserAccounts> - </component> - </settings> - <settings pass="auditUser"> - <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"> - <Display> - <ColorDepth>32</ColorDepth> - <HorizontalResolution>1024</HorizontalResolution> - <VerticalResolution>768</VerticalResolution> - </Display> - </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> - <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" 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"> - <UserAuthentication>0</UserAuthentication> - </component> - <component name="Networking-MPSSVC-Svc" 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"> - <FirewallGroups> - <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop"> - <Active>true</Active> - <Group>Remote Desktop</Group> - <Profile>all</Profile> - </FirewallGroup> - </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> - #WINDISABLENULLADMIN# - </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> - <TimeZone>#WINTIMEZONE#</TimeZone> - </component> - </settings> - <settings pass="auditSystem"> - </settings> -</unattend> diff --git a/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl index cd176a51b..0f1544a48 100644 --- a/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl +++ b/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl @@ -15,15 +15,9 @@ <DiskConfiguration> <WillShowUI>OnError</WillShowUI> <Disk> - <DiskID>0</DiskID> + <DiskID>==INSTALLTODISK==</DiskID> <WillWipeDisk>true</WillWipeDisk> - <CreatePartitions> - <CreatePartition> - <Order>1</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> + ==BOOTPARTITIONS== </Disk> </DiskConfiguration> <DynamicUpdate> @@ -32,8 +26,8 @@ <ImageInstall> <OSImage> <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> + <DiskID>==INSTALLTODISK==</DiskID> + <PartitionID>==INSTALLTOPART==</PartitionID> </InstallTo> <InstallFrom> <MetaData wcm:action="add"> @@ -58,7 +52,7 @@ <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path> + <Path>==INSTALLSHARE==\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path> </PathAndCredentials> </DriverPaths> </component> @@ -119,5 +113,4 @@ </settings> <settings pass="auditSystem"> </settings> - <cpi:offlineImage cpi:source="wim:i:/win2k8/x86_64/sources/install.wim#Windows Longhorn SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> </unattend> diff --git a/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl index 1cf2c0aaf..f4b6a8f04 100755 --- a/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl +++ b/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl @@ -12,14 +12,8 @@ <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> <Disk wcm:action="add"> - <CreatePartitions> - <CreatePartition wcm:action="add"> - <Order>1</Order> - <Type>Primary</Type> - <Extend>true</Extend> - </CreatePartition> - </CreatePartitions> - <DiskID>0</DiskID> + ==BOOTPARTITIONS== + <DiskID>==INSTALLTODISK==</DiskID> <WillWipeDisk>true</WillWipeDisk> </Disk> <WillShowUI>OnError</WillShowUI> @@ -33,30 +27,19 @@ </MetaData> </InstallFrom> <InstallTo> - <DiskID>0</DiskID> - <PartitionID>1</PartitionID> + <DiskID>==INSTALLTODISK==</DiskID> + <PartitionID>==INSTALLTOPART==</PartitionID> </InstallTo> </OSImage> </ImageInstall> <UserData> <AcceptEula>true</AcceptEula> - <FullName>xCAT USER</FullName> - <Organization>xCAT</Organization> - <ProductKey> - <Key>#TABLE:prodkey:$NODE,product=win7.ultimate:key#</Key> - <WillShowUI>OnError</WillShowUI> - </ProductKey> + #WINPRODKEY:win7.ultimate# </UserData> </component> </settings> <settings pass="specialize"> - <component name="Microsoft-Windows-UnattendedJoin" 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"> - <Identification> - <JoinDomain>#TABLE:site:key=domain:value#</JoinDomain> - <MachinePassword>#MACHINEPASSWORD#</MachinePassword> - <UnsecureJoin>true</UnsecureJoin> - </Identification> - </component> + #WINADJOIN# <component name="Microsoft-Windows-Security-SPP-UX" 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"> <SkipAutoActivation>true</SkipAutoActivation> </component> @@ -72,6 +55,11 @@ </FirewallGroup> </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> + #WINDISABLENULLADMIN# + </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> <TimeZone>#WINTIMEZONE#</TimeZone> @@ -81,7 +69,7 @@ <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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"> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>i:\drivers\win7\x86_64</Path> + <Path>==INSTALLSHARE==\drivers\win7\x86_64</Path> </PathAndCredentials> </DriverPaths> </component> @@ -95,17 +83,8 @@ </OOBE> <UserAccounts> - <DomainAccounts> - <DomainAccountList wcm:action="add"> - <DomainAccount wcm:action="add"> - <Group>Administrators</Group> - <Name>Domain Admins</Name> - </DomainAccount> - <Domain>#TABLE:site:key=domain:value#</Domain> - </DomainAccountList> - </DomainAccounts> + #WINACCOUNTDATA# </UserAccounts> </component> </settings> - <cpi:offlineImage cpi:source="wim://172.16.0.1/install/win7/x86_64/sources/install.wim#Windows 7 ULTIMATE" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> </unattend> diff --git a/xCAT-server/share/xcat/netboot/windows/fixupunattend.vbs b/xCAT-server/share/xcat/netboot/windows/fixupunattend.vbs index 12bafb8c4..e9c3541c0 100644 --- a/xCAT-server/share/xcat/netboot/windows/fixupunattend.vbs +++ b/xCAT-server/share/xcat/netboot/windows/fixupunattend.vbs @@ -36,5 +36,6 @@ Do Until srcfile.AtEndOfStream fline = Replace(fline,"==BOOTPARTITIONS==","<CreatePartitions><CreatePartition><Order>1</Order><Type>Primary</Type><Extend>true</Extend></CreatePartition></CreatePartitions>") fline = Replace(fline,"==INSTALLTOPART==","1") end if + fline = Replace(fline,"==INSTALLTODISK==","0") dstfile.WriteLine(Replace(fline,"==INSTALLSHARE==",drvletter)) Loop