Merge branch 'release-1.3'

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.3 (December 18, 2013)
+
+* Allow Packer to upload VMware Tools by default, but fall back to downloading the tools from VMware if required
+* Update SCSI bus type for the hard disk in a VMware VM to permit Windows 2012 R2 to install correctly
+* Fix Windows 2012 R2 issue where the `vagrant` user did not have its password set
+* Fix Windows 2012 R2 issue where autologon only works once
+
 ## v1.2 (December 18, 2013)
 
 * Add support for Windows 2012 and Windows 2012 R2

answer_files/2012_r2/Autounattend.xml

@@ -103,7 +103,6 @@
 				</Password>
 				<Enabled>true</Enabled>
 				<Username>vagrant</Username>
-				<LogonCount>1</LogonCount>
 			</AutoLogon>
 			<FirstLogonCommands>
 				<SynchronousCommand wcm:action="add">
@@ -255,6 +254,10 @@
 				</AdministratorPassword>
 				<LocalAccounts>
 					<LocalAccount wcm:action="add">
+						<Password>
+							<Value>vagrant</Value>
+							<PlainText>true</PlainText>
+						</Password>
 						<Group>administrators</Group>
 						<DisplayName>Vagrant</DisplayName>
 						<Name>vagrant</Name>

scripts/vm-guest-tools.bat

@@ -9,15 +9,22 @@ goto :done
 
 :vmware
 
-if not exist "C:\Windows\Temp\VMWare\setup.exe" (
-  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.0/1295980/windows/packages/tools-windows-9.6.0.exe.tar', 'C:\Windows\Temp\vmware-tools.exe.tar')" <NUL
+if exist "C:\Users\vagrant\windows.iso" (
+	move /Y C:\Users\vagrant\windows.iso C:\Windows\Temp
+)
+
+if not exist "C:\Windows\Temp\windows.iso" (
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/windows/packages/tools-windows-9.6.1.exe.tar', 'C:\Windows\Temp\vmware-tools.exe.tar')" <NUL
   cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\vmware-tools.exe.tar -oC:\Windows\Temp"
-  cmd /c C:\Windows\Temp\tools-windows-9.6.0
-  cmd /c ""C:\Program Files\7-Zip\7z.exe" x "C:\Program Files ^(x86^)\VMWare\tools-windows\windows.iso" -oC:\Windows\Temp\VMWare"
-  del /F /S /Q "C:\Program Files (x86)\VMWare"
+  FOR /r "C:\Windows\Temp" %%a in (tools-windows-*.exe) DO REN "%%~a" "tools-windows.exe"
+  cmd /c C:\Windows\Temp\tools-windows
+  move /Y "C:\Program Files (x86)\VMware\tools-windows\windows.iso" C:\Windows\Temp
+  rd /S /Q "C:\Program Files (x86)\VMWare"
 )
 
+cmd /c ""C:\Program Files\7-Zip\7z.exe" x "C:\Windows\Temp\windows.iso" -oC:\Windows\Temp\VMWare"
 cmd /c C:\Windows\Temp\VMWare\setup.exe /S /v"/qn REBOOT=R\"
+
 goto :done
 
 :virtualbox
@@ -26,7 +33,7 @@ goto :done
 :: to prevent user intervention popups which will undermine a silent installation.
 cmd /c certutil -addstore -f "TrustedPublisher" A:\oracle-cert.cer
 
-mv C:\Users\vagrant\VBoxGuestAdditions.iso C:\Windows\Temp
+move /Y C:\Users\vagrant\VBoxGuestAdditions.iso C:\Windows\Temp
 cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\VBoxGuestAdditions.iso -oC:\Windows\Temp\virtualbox"
 cmd /c C:\Windows\Temp\virtualbox\VBoxWindowsAdditions.exe /S
 goto :done

windows_2008_r2.json

@@ -1,7 +1,7 @@
 {
   "builders": [{
     "type": "vmware",
-    "iso_url": "http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+    "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
     "iso_checksum_type": "md5",
     "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
     "headless": true,
@@ -11,6 +11,7 @@
     "ssh_wait_timeout": "2h",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
     "guest_os_type": "windows7srv-64",
+	"tools_upload_flavor": "windows",
     "disk_size": 61440,
     "vnc_port_min": 5900,
     "vnc_port_max": 5980,
@@ -23,11 +24,12 @@
       "RemoteDisplay.vnc.enabled": "false",
       "RemoteDisplay.vnc.port": "5900",
       "memsize": "2048",
-      "numvcpus": "2"
+      "numvcpus": "2",
+	  "scsi0.virtualDev": "lsisas1068"
     }
   }, {
     "type": "virtualbox",
-    "iso_url": "http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+    "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
     "iso_checksum_type": "md5",
     "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
     "headless": true,

windows_2012.json

@@ -1,7 +1,7 @@
 {
   "builders": [{
     "type": "vmware",
-    "iso_url": "http://care.dlservice.microsoft.com//dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
+    "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
     "iso_checksum_type": "md5",
     "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
     "headless": true,
@@ -11,6 +11,7 @@
     "ssh_wait_timeout": "2h",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
     "guest_os_type": "windows8srv-64",
+	"tools_upload_flavor": "windows",
     "disk_size": 61440,
     "vnc_port_min": 5900,
     "vnc_port_max": 5980,
@@ -23,11 +24,12 @@
       "RemoteDisplay.vnc.enabled": "false",
       "RemoteDisplay.vnc.port": "5900",
       "memsize": "2048",
-      "numvcpus": "2"
+      "numvcpus": "2",
+	  "scsi0.virtualDev": "lsisas1068"
     }
   }, {
     "type": "virtualbox",
-    "iso_url": "http://care.dlservice.microsoft.com//dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
+    "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
     "iso_checksum_type": "md5",
     "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
     "headless": true,

windows_2012_r2.json

@@ -11,6 +11,7 @@
     "ssh_wait_timeout": "2h",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
     "guest_os_type": "windows8srv-64",
+	"tools_upload_flavor": "windows",
     "disk_size": 61440,
     "vnc_port_min": 5900,
     "vnc_port_max": 5980,