Merge branch 'release-1.4'

.gitignore

@@ -2,6 +2,11 @@
 /iso/*
 !/iso/README.md
 /output-vmware/
+/output-vmware-iso/
+/output-vmware-vmx/
 /output-virtualbox/
+/output-virtualbox-iso/
+/output-virtualbox-ovf/
 /*.box
 /packer_cache/
+

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.4 (December 31, 2013)
+
+* Update .json files to work with Packer 0.5.0 (the `vmware` builder is renamed to `vmware-iso`, the `virtualbox` builder is renamed to `virtualbox-iso`)
+* Update README with better examples for using retail custom ISO files and disabling Windows Update installation
+
 ## v1.3 (December 18, 2013)
 
 * Allow Packer to upload VMware Tools by default, but fall back to downloading the tools from VMware if required

README.md

@@ -6,6 +6,10 @@ This repository contains Windows templates that can be used to create boxes for
 
 This repo began by borrowing bits from the VeeWee Windows templates (https://github.com/jedi4ever/veewee/tree/master/templates). Modifications were made to work with Packer and the VMware Fusion provider for Packer and Vagrant.
 
+### Packer Version
+
+[Packer](https://github.com/mitchellh/packer/blob/master/CHANGELOG.md) `0.5.0` or greater is required.
+
 ### Windows Versions
 
 The following Windows versions are known to work (built with VMware Fusion 6.0.2):
@@ -26,15 +30,33 @@ All Windows Server versions are defaulted to the Server Standard edition. You ca
 
 ### Windows Updates
 
-The scripts in this repo will install all Windows updates – by default – during Windows Setup. This is a _very_ time consuming process, depending on the age of the OS and the quantity of updates released since the last service pack. You might want to do yourself a favor during development and disable this functionality, by commenting out this First Logon Command:
+The scripts in this repo will install all Windows updates – by default – during Windows Setup. This is a _very_ time consuming process, depending on the age of the OS and the quantity of updates released since the last service pack. You might want to do yourself a favor during development and disable this functionality, by commenting out the `WITH WINDOWS UPDATES` section and uncommenting the `WITHOUT WINDOWS UPDATES` section in `Autounattend.xml`:
 
-```
+```xml
+<!-- WITHOUT WINDOWS UPDATES -->
+<SynchronousCommand wcm:action="add">
+	<CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1 -AutoStart</CommandLine>
+	<Description>Install OpenSSH</Description>
+	<Order>99</Order>
+	<RequiresUserInput>true</RequiresUserInput>
+</SynchronousCommand>
+<!-- END WITHOUT WINDOWS UPDATES -->
+<!-- WITH WINDOWS UPDATES -->
+<!--
+<SynchronousCommand wcm:action="add">
+	<CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>
+	<Description>Install OpenSSH</Description>
+	<Order>99</Order>
+	<RequiresUserInput>true</RequiresUserInput>
+</SynchronousCommand>
 <SynchronousCommand wcm:action="add">
 	<CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\win-updates.ps1</CommandLine>
 	<Description>Install Windows Updates</Description>
 	<Order>100</Order>
 	<RequiresUserInput>true</RequiresUserInput>
 </SynchronousCommand>
+-->
+<!-- END WITH WINDOWS UPDATES -->
 ```
 
 Doing so will give you hours back in your day, which is a good thing.
@@ -55,17 +77,17 @@ If you are going to use the .box files produced by the project with Vagrant, you
 
 ### Getting Started
 
-Currently, this repo leverages trial versions of Windows 2008 R2 / 2012 / 2012 R2. 
-
+Trial versions of Windows 2008 R2 / 2012 / 2012 R2 are used by default. These images can be used for 180 days without activation.
 
-Alternatively, if you have access to [MSDN](http://msdn.microsoft.com) or TechNet, you can download the ISO images Microsoft makes available there and place them in the `iso` directory. If you do so, you should update the relevent `.json` file, setting `iso_url` to `"./iso/<path to your iso>.iso"` and `iso_checksum` to `<the md5 of your iso>` after following these instructions:
+Alternatively – if you have access to [MSDN](http://msdn.microsoft.com) or [TechNet](http://technet.microsoft.com/) – you can download retail or volume license ISO images and place them in the `iso` directory. If you do, you should update the relevent `.json` file, setting `iso_url` to `./iso/<path to your iso>.iso` and `iso_checksum` to `<the md5 of your iso>`. For example, to use the Windows 2008 R2 (With SP1) retail ISO:
 
 1. Download the Windows Server 2008 R2 with Service Pack 1 (x64) - DVD (English) ISO (`en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso`)
 2. Verify that `en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso` has an MD5 hash of `8dcde01d0da526100869e2457aafb7ca` (Microsoft lists a SHA1 hash of `d3fd7bf85ee1d5bdd72de5b2c69a7b470733cd0a`, which is equivalent)
 3. Clone this repo to a local directory
-4. Create a directory named `iso` in the root of the repo
-5. Move `en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso` to the `iso` directory
-6. Run `packer build windows_2008_r2.json`
+4. Move `en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso` to the `iso` directory
+5. Update `windows_2008_r2.json`, setting `iso_url` to `./iso/en_windows_server_2008_r2_with_sp1_x64_dvd_617601.iso`
+6. Update `windows_2008_r2.json`, setting `iso_checksum` to `8dcde01d0da526100869e2457aafb7ca`
+7. Run `packer build windows_2008_r2.json`
 
 ### Contributing