From 251bacf87c1406385e6e64ac9b08e2d922b2f88d Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Sun, 3 Nov 2013 18:42:16 -0500 Subject: [PATCH 1/2] Added working definition for Windows 2012R2 Standard Edition --- Gemfile | 4 +- Gemfile.lock | 104 +++++------ .../windows-2012r2-standard/Autounattend.xml | 164 ++++++++++++++++++ definitions/windows-2012r2-standard/README.md | 58 +++++++ .../windows-2012r2-standard/definition.rb | 20 +++ .../windows-2012r2-standard/install-chef.bat | 47 +++++ .../windows-2012r2-standard/install-vbox.bat | 4 + .../mount-validation.bat | 3 + .../windows-2012r2-standard/oracle-cert.cer | Bin 0 -> 1398 bytes 9 files changed, 350 insertions(+), 54 deletions(-) create mode 100644 definitions/windows-2012r2-standard/Autounattend.xml create mode 100644 definitions/windows-2012r2-standard/README.md create mode 100644 definitions/windows-2012r2-standard/definition.rb create mode 100644 definitions/windows-2012r2-standard/install-chef.bat create mode 100644 definitions/windows-2012r2-standard/install-vbox.bat create mode 100644 definitions/windows-2012r2-standard/mount-validation.bat create mode 100644 definitions/windows-2012r2-standard/oracle-cert.cer diff --git a/Gemfile b/Gemfile index be2c8bb73..83a3308ac 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.7' -gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de48' +gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.3.5' +gem "veewee", "~> 0.3.12" gem "vagrant-windows", "~> 1.2.1" gem "em-winrm" # for windows! gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock index 9252b27e4..75d289536 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,9 @@ -GIT - remote: https://github.com/jedi4ever/veewee.git - revision: 4e5d50de4866472bd3e7060157ac573457196760 - ref: 4e5d50de48 - specs: - veewee (0.3.7) - ansi (~> 1.3.0) - childprocess - fission (= 0.4.0) - fog (~> 1.8) - grit - highline - i18n - json - net-ssh (>= 2.2.0) - popen4 (~> 0.1.2) - progressbar - ruby-vnc (~> 1.0.0) - thor (~> 0.15) - GIT remote: https://github.com/mitchellh/vagrant.git - revision: 7ec0ee1d00a916f80b109a298bab08e391945243 - tag: v1.2.7 + revision: a40522f5fabccb9ddabad03d836e120ff5d14093 + tag: v1.3.5 specs: - vagrant (1.2.7) + vagrant (1.3.5) childprocess (~> 0.3.7) erubis (~> 2.7.0) i18n (~> 0.6.0) @@ -42,30 +22,30 @@ GEM gyoku (>= 0.4.0) nokogiri (>= 1.4.0) ansi (1.3.0) - builder (3.2.0) + builder (3.2.2) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) diff-lcs (1.2.4) em-winrm (0.5.4) - eventmachine (= 1.0.0.beta.3) + eventmachine (~> 1.0.0) mixlib-log (>= 1.3.0) uuidtools (~> 2.1.1) winrm (~> 1.1.0) erubis (2.7.0) - eventmachine (1.0.0.beta.3) - excon (0.22.1) - ffi (1.7.0) + eventmachine (1.0.3) + excon (0.28.0) + ffi (1.9.3) fission (0.4.0) CFPropertyList (~> 2.0.17) - fog (1.11.1) + fog (1.18.0) builder - excon (~> 0.20) + excon (~> 0.28.0) formatador (~> 0.2.0) - json (~> 1.7) mime-types + multi_json (~> 1.0) net-scp (~> 1.1) net-ssh (>= 2.1.3) - nokogiri (~> 1.5.0) + nokogiri (~> 1.5) ruby-hmac formatador (0.2.4) grit (2.5.0) @@ -74,34 +54,39 @@ GEM posix-spawn (~> 0.3.6) gssapi (1.0.3) ffi (>= 1.0.1) - gyoku (1.0.0) + gyoku (1.1.0) builder (>= 2.1.2) - highline (1.6.19) - httpclient (2.2.0.2) + highline (1.6.20) + httpclient (2.3.4.1) httpi (0.9.7) rack - i18n (0.6.4) - json (1.7.7) - libxml-ruby (2.6.0) + i18n (0.6.5) + json (1.8.1) + libxml-ruby (2.7.0) little-plugger (1.1.3) log4r (1.1.10) - logging (1.6.2) + logging (1.8.1) little-plugger (>= 1.1.3) - mime-types (1.23) + multi_json (>= 1.3.6) + mime-types (1.25) + mini_portile (0.5.2) mixlib-log (1.6.0) - net-scp (1.1.0) + multi_json (1.8.2) + net-scp (1.1.2) net-ssh (>= 2.6.5) - net-ssh (2.6.7) - nokogiri (1.5.9) + net-ssh (2.6.8) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) nori (1.1.5) open4 (1.3.0) + os (0.9.6) popen4 (0.1.2) Platform (>= 0.4.0) open4 (>= 0.4.0) posix-spawn (0.3.6) - progressbar (0.20.0) + progressbar (0.21.0) rack (1.5.2) - rake (10.0.4) + rake (10.1.0) ruby-hmac (0.4.0) ruby-vnc (1.0.1) rubyntlm (0.1.1) @@ -114,16 +99,31 @@ GEM nori (~> 1.0) wasabi (~> 1.0) thor (0.18.1) - uuidtools (2.1.3) - vagrant-windows (1.2.1) + uuidtools (2.1.4) + vagrant-windows (1.2.3) winrm (~> 1.1.1) + veewee (0.3.12) + ansi (~> 1.3.0) + childprocess + fission (= 0.4.0) + fog (~> 1.8) + grit + highline + i18n + json + net-ssh (>= 2.2.0) + os (~> 0.9.6) + popen4 (~> 0.1.2) + progressbar + ruby-vnc (~> 1.0.0) + thor (~> 0.15) wasabi (1.0.0) nokogiri (>= 1.4.0) - winrm (1.1.2) + winrm (1.1.3) gssapi (~> 1.0.0) - httpclient (~> 2.2.0.2) - logging (~> 1.6.1) - nokogiri (~> 1.5.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (~> 1.6, >= 1.6.1) + nokogiri (~> 1.5) rubyntlm (~> 0.1.1) savon (= 0.9.5) uuidtools (~> 2.1.2) @@ -136,4 +136,4 @@ DEPENDENCIES rake vagrant! vagrant-windows (~> 1.2.1) - veewee! + veewee (~> 0.3.12) diff --git a/definitions/windows-2012r2-standard/Autounattend.xml b/definitions/windows-2012r2-standard/Autounattend.xml new file mode 100644 index 000000000..23f68051c --- /dev/null +++ b/definitions/windows-2012r2-standard/Autounattend.xml @@ -0,0 +1,164 @@ + + + + + + + en-US + + en-US + en-US + en-US + en-US + + + + + + + 1 + 20000 + Primary + + + + + false + NTFS + + C + 1 + 1 + + + 0 + true + + + + + + + /IMAGE/NAME + Windows Server 2012 R2 SERVERSTANDARD + + + + 0 + 1 + + + + + true + Vagrant + Vagrant + + + + + + + + dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA + false</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>Administrator</Username> + </AutoLogon> + <ComputerName>vagrant-2012</ComputerName> + <RegisteredOrganization>Vagrant</RegisteredOrganization> + <RegisteredOwner>Vagrant</RegisteredOwner> + <TimeZone>UTC</TimeZone> + <ProductKey>W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9</ProductKey> + </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> + </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"> + <AutoLogon> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Enabled>true</Enabled> + <Username>Administrator</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <Order>1</Order> + <RequiresUserInput>true</RequiresUserInput> + <CommandLine>cmd.exe /c winrm quickconfig -q</CommandLine> + <Description>winrm quickconfig -q</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>2</Order> + <CommandLine>cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}</CommandLine> + <RequiresUserInput>true</RequiresUserInput> + <Description>winrm memory</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}</CommandLine> + <Description>winrm timeout</Description> + <Order>3</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}</CommandLine> + <Description>winrm encryption</Description> + <Order>4</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>winrm set winrm/config/service/auth @{Basic="true"}</CommandLine> + <Description>winrm basic auth</Description> + <Order>5</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>cmd.exe /c netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any</CommandLine> + <Description>winrm firewall</Description> + <Order>6</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine> + <Description>fix powershell remote exec policy</Description> + <Order>7</Order> + <RequiresUserInput>true</RequiresUserInput> + </SynchronousCommand> + </FirstLogonCommands> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Home</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <HideOnlineAccountScreens>true</HideOnlineAccountScreens> + <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen> + <HideLocalAccountScreen>true</HideLocalAccountScreen> + </OOBE> + <UserAccounts> + <AdministratorPassword> + <Value>dgBhAGcAcgBhAG4AdABBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value> + <PlainText>false</PlainText> + </AdministratorPassword> + <LocalAccounts> + <LocalAccount wcm:action="add"> + <Password> + <Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value> + <PlainText>false</PlainText> + </Password> + <Description>Vagrant User</Description> + <DisplayName>vagrant</DisplayName> + <Group>Administrators</Group> + <Name>vagrant</Name> + </LocalAccount> + </LocalAccounts> + </UserAccounts> + <ShowWindowsLive>false</ShowWindowsLive> + </component> + </settings> + <cpi:offlineImage cpi:source="wim:c:/users/administrator/documents/install.wim#Windows Server 2012R2 SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/definitions/windows-2012r2-standard/README.md b/definitions/windows-2012r2-standard/README.md new file mode 100644 index 000000000..562c739f7 --- /dev/null +++ b/definitions/windows-2012r2-standard/README.md @@ -0,0 +1,58 @@ +You can download a free trial of Windows Server 2012 from Microsoft: + +* url: http://technet.microsoft.com/en-us/evalcenter/hh670538.aspx + +But they seem to always generate the same URL that's in the definition. If it ever changes, you can update the definition. + +The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. + +To edit the Autounattend.xml and validate it you can download The Windows® Automated Deployment Kit (ADK) for Windows® 8. Windows Server 2012 is based off Windows 8. + +* url: http://www.microsoft.com/en-us/download/details.aspx?id=30652 + +ADK also includes dism, which will allow you to choose a specific version of Windows 2012 to install. + +If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with +one of the names listed in the Server 2012 install.wim on the install DVD .iso + + +```xml +<InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/NAME</Key> + <Value>Windows Server 2012 SERVERSTANDARD</Value> + </MetaData> +</InstallFrom> +``` + +``` +PS C:\Users\Administrator> Dism /Get-WIMInfo /WimFile:D:\sources\install.wim + +Deployment Image Servicing and Management tool +Version: 6.2.9200.16384 + +Details for image : D:\sources\install.wim + +Index : 1 +Name : Windows Server 2012 SERVERSTANDARDCORE +Description : Windows Server 2012 SERVERSTANDARDCORE +Size : 7,182,564,199 bytes + +Index : 2 +Name : Windows Server 2012 SERVERSTANDARD +Description : Windows Server 2012 SERVERSTANDARD +Size : 12,002,145,363 bytes + +Index : 3 +Name : Windows Server 2012 SERVERDATACENTERCORE +Description : Windows Server 2012 SERVERDATACENTERCORE +Size : 7,177,138,892 bytes + +Index : 4 +Name : Windows Server 2012 SERVERDATACENTER +Description : Windows Server 2012 SERVERDATACENTER +Size : 11,997,664,663 bytes + +The operation completed successfully. +``` + diff --git a/definitions/windows-2012r2-standard/definition.rb b/definitions/windows-2012r2-standard/definition.rb new file mode 100644 index 000000000..a37367dd1 --- /dev/null +++ b/definitions/windows-2012r2-standard/definition.rb @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +require File.dirname(__FILE__) + "/../.windows/session.rb" + +iso_src = "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO" + +session = WINDOWS_SESSION.merge({ + :os_type_id => 'Windows8_64', + :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-US/evalcenter/hh670538.aspx", + :iso_src => iso_src, + :iso_file => File.basename(iso_src), + :iso_md5 => "458ff91f8abc21b75cb544744bf92e6a", + :kickstart_port => "7122", + :winrm_host_port => "2012", + :memory_size=> "512", + :virtualbox => { + :extradata => 'VBoxInternal/CPUM/CMPXCHG16B 1', + } + }) + +Veewee::Session.declare session diff --git a/definitions/windows-2012r2-standard/install-chef.bat b/definitions/windows-2012r2-standard/install-chef.bat new file mode 100644 index 000000000..2107a1b29 --- /dev/null +++ b/definitions/windows-2012r2-standard/install-chef.bat @@ -0,0 +1,47 @@ +@REM Loop ten times to make sure outbound networking is up +FOR /L %%n IN (1,1,10) DO ( + PING -n 1 www.opscode.com + IF %ERRORLEVEL% == 0 CALL :wget + TIMEOUT 10 +) + +:err +ECHO "Couldn't reach Opscode even after 10 retries" +GOTO :done + +:wget +@rem Install Chef using chef-client MSI installer +@setlocal + +@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi +@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi +@set FALLBACK_QUERY_STRING=?DownloadContext=PowerShell + +@set ALTERNATE_DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%') + +cscript /nologo %TEMP%\wget.vbs /url:%REMOTE_SOURCE_MSI_URL% /path:"%LOCAL_DESTINATION_MSI_PATH%" + +@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas +@rem that cause the MSI download process to exceed the quota even when it is increased by administrators. +@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available. +@if ERRORLEVEL 1 ( + echo Warning: Failed to download %REMOTE_SOURCE_MSI_URL% to %LOCAL_DESTINATION_MSI_PATH% + echo Warning: Retrying download with PowerShell if available + if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%" + echo powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + powershell -noprofile -noninteractive -command "%ALTERNATE_DOWNLOAD_COMMAND%" + if NOT ERRORLEVEL 1 ( + echo Download succeeded + ) else ( + echo Failed to download %REMOTE_SOURCE_MSI_URL% + echo Subsequent attempt to install the downloaded MSI is likely to fail + ) +) + +msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%" + +@endlocal +EXIT + +:done +EXIT diff --git a/definitions/windows-2012r2-standard/install-vbox.bat b/definitions/windows-2012r2-standard/install-vbox.bat new file mode 100644 index 000000000..614c415c7 --- /dev/null +++ b/definitions/windows-2012r2-standard/install-vbox.bat @@ -0,0 +1,4 @@ +cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer +cmd /c e:\VBoxWindowsAdditions-amd64.exe /S +cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions" + diff --git a/definitions/windows-2012r2-standard/mount-validation.bat b/definitions/windows-2012r2-standard/mount-validation.bat new file mode 100644 index 000000000..ae458c1d6 --- /dev/null +++ b/definitions/windows-2012r2-standard/mount-validation.bat @@ -0,0 +1,3 @@ +REM This is so we can pass the validation test... I don't know that it's necessary +cmd /c net use z: \\vboxsrv\veewee-validation + diff --git a/definitions/windows-2012r2-standard/oracle-cert.cer b/definitions/windows-2012r2-standard/oracle-cert.cer new file mode 100644 index 0000000000000000000000000000000000000000..6f3380d48553956036650bc711ca5aed73a1224d GIT binary patch literal 1398 zcmXqLVl6UgVu@P7%*4pVBoH|JX8KPK#!$sYJbaVIzH}P!vT<s)d9;1!Wn^S!WiV*m zV#sa4$;KSY!Y0fV8f++TAPVAe3G;=e7G(x!rswG>c;+SR8Oj^Tf+V<w#b6Q&Aw{Ld zB?^A2CFS`=*@o5zmJkI-A*n^V#R~ap3Z=!V3W+5O86_nJ#a8<I<>lpiWk6Glfu`yu z=jZAd6(lNXBx@QP80s15fHX4;tHMop&PgmTRxnm@&QD2I068QxFI~aNz|cU!+0j5w zoY&CMz{tSD01TplToWMI+{oC}($q4_pm8gzw}cG@LFRJ^b2%sGWTxd8<z*(q{K_uO z7nGV(o}Zth5S)=;lv->kZ6FC!%_Sn_UzC`flL~Z0Q9*uDVo7Fxo}rzA4aA?OE}7|> zC5br-o-PV7$LcEhW+oTq7w4yyC<FtE^2DN4g)pF%DPYYCWkxW=nXwse(8Q>O97Bw( z49rc8{0u;GE~X|%MuyHw?*%`8FjtXzIendtSKY3w*O-60EAjFQ2OV~w_ftDDLUzu_ z85<Wa=?S-*nejb)|0Bzi=ZAKyJXs+1{&U}<E!<r7eBtNQVs{iy`CpdM8+pV3kFKYd z;{O}R&%U~HRFb)|&*|X#58c1RGz)!dcTGuVbeeB)eCp1-hX0aX)OY`{ZrXppaE9c( z=3cQz#vO?t;*(yVb7)<pC3A9tz>SryzkP0TS}(uOwDSCq)A{l5xun*{K0kH+^Qm$< z{v9i2H}l%A36FnQYWvH^<3!H>xUK(c<{T^S(EK-X{(E*tk9{wuILuppXYONpzdIrm z6;8kD=Vfr5%TV)i?iWRwFs0(DVJoe?Co?fKGB7S~Vyp&+NI5v&$_leE888^|0pmoL zpONuD3kx$7dxL=kh%e7#X<%+(y1;mWVVgcE6#^4sa&fY;E+`r4CKu(PCP(LBXNZ&@ zP|CmsWP$>VtpO-ub0@TUFt+`0Wn>p;HqbKAVB^qc1LhxgCPpzCe97BD7-Whn3y%R8 zObau!K_QII$jFjvkZhm=;~OxxNkHA1pIlsk;yeRuxGE+rzDdkXL{YAf<eStY19^}; zlvyMU#2Q4-&s_PcTJ4MX$-e&UA6V7iKfbhlE--&^Lj33ibQCZQSp*Ek*tmecWMOPF zXJV9Q;V@tWCO}{aBPUQ`5duu0j10%my}A5s>tn4l8@-n`97fxDH}mY7!8P?YpYXXe zANBj<Zy#8B<=plhr2w0$&kh}Y;3_J_rq%O(!d;Kdh!69Qrx$0(Z#pBlLibZ#!*^ku zETe+LaLfPw_xTrys&70sPe)j1+iVq`aMSBM(lw_ziD+!<3Y)OpMqT!-=r7Lxi?JI@ z<mcTks*7urddn8t7Ob=7j{GmlCwc6O!YLD(?sT2IaC=(b)&muZ35!DO?Rt6F3ICk! zzWcisYuQ$<<p-zv%;P9Gxv*7GE-~|}O~UcDuPhm!mwENJ*Y;evpI^83&Bmf4#}q;F kZ>ww{IP}*EUbv-wBB=FaQSwz;n~wTPeHRx#@~!?40OZx*k^lez literal 0 HcmV?d00001 From a55c98806270bde092e6831b79ec6cd5bd933718 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" <jdunn@opscode.com> Date: Sun, 3 Nov 2013 18:46:11 -0500 Subject: [PATCH 2/2] Update links for Windows 2012R2. --- definitions/windows-2012r2-standard/README.md | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/definitions/windows-2012r2-standard/README.md b/definitions/windows-2012r2-standard/README.md index 562c739f7..42ab14e6a 100644 --- a/definitions/windows-2012r2-standard/README.md +++ b/definitions/windows-2012r2-standard/README.md @@ -1,26 +1,26 @@ -You can download a free trial of Windows Server 2012 from Microsoft: +You can download a free trial of Windows Server 2012R2 from Microsoft: -* url: http://technet.microsoft.com/en-us/evalcenter/hh670538.aspx +* url: http://technet.microsoft.com/en-US/evalcenter/dn205286.aspx But they seem to always generate the same URL that's in the definition. If it ever changes, you can update the definition. The installation uses the Standard Windows Unattended installation. The XML file was created using the Windows AIK kit, but the file can also be edited by hand. -To edit the Autounattend.xml and validate it you can download The Windows® Automated Deployment Kit (ADK) for Windows® 8. Windows Server 2012 is based off Windows 8. +To edit the Autounattend.xml and validate it you can download The Windows® Automated Deployment Kit (ADK) for Windows® 8.1. Windows Server 2012R2 is based off Windows 8.1. -* url: http://www.microsoft.com/en-us/download/details.aspx?id=30652 +* url: http://www.microsoft.com/en-us/download/details.aspx?id=39982 -ADK also includes dism, which will allow you to choose a specific version of Windows 2012 to install. +ADK also includes dism, which will allow you to choose a specific version of Windows 2012R2 to install. If you want to install a different version, edit Autoattended.xml and replace the /IMAGE/NAME value with -one of the names listed in the Server 2012 install.wim on the install DVD .iso +one of the names listed in the Server 2012R2 install.wim on the install DVD .iso ```xml <InstallFrom> <MetaData wcm:action="add"> <Key>/IMAGE/NAME</Key> - <Value>Windows Server 2012 SERVERSTANDARD</Value> + <Value>Windows Server 2012R2 SERVERSTANDARD</Value> </MetaData> </InstallFrom> ``` @@ -34,23 +34,23 @@ Version: 6.2.9200.16384 Details for image : D:\sources\install.wim Index : 1 -Name : Windows Server 2012 SERVERSTANDARDCORE -Description : Windows Server 2012 SERVERSTANDARDCORE +Name : Windows Server 2012R2 SERVERSTANDARDCORE +Description : Windows Server 2012R2 SERVERSTANDARDCORE Size : 7,182,564,199 bytes Index : 2 -Name : Windows Server 2012 SERVERSTANDARD -Description : Windows Server 2012 SERVERSTANDARD +Name : Windows Server 2012R2 SERVERSTANDARD +Description : Windows Server 2012R2 SERVERSTANDARD Size : 12,002,145,363 bytes Index : 3 -Name : Windows Server 2012 SERVERDATACENTERCORE -Description : Windows Server 2012 SERVERDATACENTERCORE +Name : Windows Server 2012R2 SERVERDATACENTERCORE +Description : Windows Server 2012R2 SERVERDATACENTERCORE Size : 7,177,138,892 bytes Index : 4 -Name : Windows Server 2012 SERVERDATACENTER -Description : Windows Server 2012 SERVERDATACENTER +Name : Windows Server 2012R2 SERVERDATACENTER +Description : Windows Server 2012R2 SERVERDATACENTER Size : 11,997,664,663 bytes The operation completed successfully.