From d307cc8d79440f6befc367edb1994a4f8f98a8cf Mon Sep 17 00:00:00 2001
From: Ken Sykora <ksykora@nerdery.com>
Date: Wed, 14 May 2014 09:57:51 -0500
Subject: [PATCH 1/5] Enables Windows Update to pull updates from both Windows
 "And other Microsoft products"

---
 answer_files/2008_r2/Autounattend.xml      |  5 +++++
 answer_files/2008_r2_core/Autounattend.xml |  5 +++++
 answer_files/2012/Autounattend.xml         |  5 +++++
 answer_files/2012_r2/Autounattend.xml      |  5 +++++
 answer_files/2012_r2_core/Autounattend.xml |  5 +++++
 answer_files/7/Autounattend.xml            |  5 +++++
 answer_files/81/Autounattend.xml           |  5 +++++
 scripts/microsoft-updates.bat              | 12 ++++++++++++
 windows_2008_r2.json                       |  2 ++
 windows_2008_r2_core.json                  |  2 ++
 windows_2012.json                          |  2 ++
 windows_2012_r2.json                       |  2 ++
 windows_2012_r2_core.json                  |  2 ++
 13 files changed, 57 insertions(+)
 create mode 100644 scripts/microsoft-updates.bat

diff --git a/answer_files/2008_r2/Autounattend.xml b/answer_files/2008_r2/Autounattend.xml
index 07a1954d..0eb29777 100644
--- a/answer_files/2008_r2/Autounattend.xml
+++ b/answer_files/2008_r2/Autounattend.xml
@@ -226,6 +226,11 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>22</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/2008_r2_core/Autounattend.xml b/answer_files/2008_r2_core/Autounattend.xml
index f764f892..7493415a 100644
--- a/answer_files/2008_r2_core/Autounattend.xml
+++ b/answer_files/2008_r2_core/Autounattend.xml
@@ -262,6 +262,11 @@
                     <Order>27</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>28</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/2012/Autounattend.xml b/answer_files/2012/Autounattend.xml
index 8f27faf5..bbf89b07 100644
--- a/answer_files/2012/Autounattend.xml
+++ b/answer_files/2012/Autounattend.xml
@@ -231,6 +231,11 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>22</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/2012_r2/Autounattend.xml b/answer_files/2012_r2/Autounattend.xml
index 55955a9c..281e2a8e 100644
--- a/answer_files/2012_r2/Autounattend.xml
+++ b/answer_files/2012_r2/Autounattend.xml
@@ -228,6 +228,11 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>22</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/2012_r2_core/Autounattend.xml b/answer_files/2012_r2_core/Autounattend.xml
index df30664c..be930ea1 100644
--- a/answer_files/2012_r2_core/Autounattend.xml
+++ b/answer_files/2012_r2_core/Autounattend.xml
@@ -228,6 +228,11 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>22</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/7/Autounattend.xml b/answer_files/7/Autounattend.xml
index e281d5f9..764d6cf8 100644
--- a/answer_files/7/Autounattend.xml
+++ b/answer_files/7/Autounattend.xml
@@ -227,6 +227,11 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>22</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/81/Autounattend.xml b/answer_files/81/Autounattend.xml
index 5a35f096..3f804e19 100644
--- a/answer_files/81/Autounattend.xml
+++ b/answer_files/81/Autounattend.xml
@@ -224,6 +224,11 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>22</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/scripts/microsoft-updates.bat b/scripts/microsoft-updates.bat
new file mode 100644
index 00000000..2cb8fa02
--- /dev/null
+++ b/scripts/microsoft-updates.bat
@@ -0,0 +1,12 @@
+net stop wuauserv
+
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update" /v EnableFeaturedSoftware /t REG_DWORD /d 1 /f
+
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update" /v IncludeRecommendedUpdates /t REG_DWORD /d 1 /f
+
+echo Set ServiceManager = CreateObject("Microsoft.Update.ServiceManager") > A:\temp.vbs
+echo Set NewUpdateService = ServiceManager.AddService2("7971f918-a847-4430-9279-4a52d1efe18d",7,"") >> A:\temp.vbs
+
+cscript A:\temp.vbs
+
+net start wuauserv
\ No newline at end of file
diff --git a/windows_2008_r2.json b/windows_2008_r2.json
index 5478d54d..b386efde 100644
--- a/windows_2008_r2.json
+++ b/windows_2008_r2.json
@@ -18,6 +18,7 @@
             "vnc_port_max": 5980,
             "floppy_files": [
                 "./answer_files/2008_r2/Autounattend.xml",
+                "./scripts/microsoft-updates.bat",
                 "./scripts/win-updates.ps1",
                 "./scripts/openssh.ps1"
             ],
@@ -44,6 +45,7 @@
             "disk_size": 61440,
             "floppy_files": [
                 "./answer_files/2008_r2/Autounattend.xml",
+                "./scripts/microsoft-updates.bat",
                 "./scripts/win-updates.ps1",
                 "./scripts/openssh.ps1",
                 "./scripts/oracle-cert.cer"
diff --git a/windows_2008_r2_core.json b/windows_2008_r2_core.json
index 8f959e05..c2750116 100644
--- a/windows_2008_r2_core.json
+++ b/windows_2008_r2_core.json
@@ -17,6 +17,7 @@
     "vnc_port_max": 5980,
     "floppy_files": [
       "./answer_files/2008_r2_core/Autounattend.xml",
+      "./scripts/microsoft-updates.bat",
       "./scripts/win-updates.ps1",
       "./scripts/openssh.ps1"
     ],
@@ -42,6 +43,7 @@
     "disk_size": 61440,
     "floppy_files": [
       "./answer_files/2008_r2_core/Autounattend.xml",
+      "./scripts/microsoft-updates.bat",
       "./scripts/win-updates.ps1",
       "./scripts/openssh.ps1",
       "./scripts/oracle-cert.cer"
diff --git a/windows_2012.json b/windows_2012.json
index 2ddd265d..eb46dace 100644
--- a/windows_2012.json
+++ b/windows_2012.json
@@ -18,6 +18,7 @@
             "vnc_port_max": 5980,
             "floppy_files": [
                 "./answer_files/2012/Autounattend.xml",
+                "./scripts/microsoft-updates.bat",
                 "./scripts/win-updates.ps1",
                 "./scripts/openssh.ps1"
             ],
@@ -44,6 +45,7 @@
             "disk_size": 61440,
             "floppy_files": [
                 "./answer_files/2012/Autounattend.xml",
+                "./scripts/microsoft-updates.bat",
                 "./scripts/win-updates.ps1",
                 "./scripts/openssh.ps1",
                 "./scripts/oracle-cert.cer"
diff --git a/windows_2012_r2.json b/windows_2012_r2.json
index 20229b98..268ee269 100644
--- a/windows_2012_r2.json
+++ b/windows_2012_r2.json
@@ -18,6 +18,7 @@
             "vnc_port_max": 5980,
             "floppy_files": [
                 "./answer_files/2012_r2/Autounattend.xml",
+                "./scripts/microsoft-updates.bat",
                 "./scripts/win-updates.ps1",
                 "./scripts/openssh.ps1"
             ],
@@ -44,6 +45,7 @@
             "disk_size": 61440,
             "floppy_files": [
                 "./answer_files/2012_r2/Autounattend.xml",
+                "./scripts/microsoft-updates.bat",
                 "./scripts/win-updates.ps1",
                 "./scripts/openssh.ps1",
                 "./scripts/oracle-cert.cer"
diff --git a/windows_2012_r2_core.json b/windows_2012_r2_core.json
index e42d6201..0beee13a 100644
--- a/windows_2012_r2_core.json
+++ b/windows_2012_r2_core.json
@@ -18,6 +18,7 @@
             "vnc_port_max": 5980,
             "floppy_files": [
                 "./answer_files/2012_r2_core/Autounattend.xml",
+                "./scripts/microsoft-updates.bat",
                 "./scripts/win-updates.ps1",
                 "./scripts/openssh.ps1"
             ],
@@ -44,6 +45,7 @@
             "disk_size": 61440,
             "floppy_files": [
                 "./answer_files/2012_r2_core/Autounattend.xml",
+                "./scripts/microsoft-updates.bat",
                 "./scripts/win-updates.ps1",
                 "./scripts/openssh.ps1",
                 "./scripts/oracle-cert.cer"

From 64261bc18890e9e9932d796fca2b6673f1708e37 Mon Sep 17 00:00:00 2001
From: Ken Sykora <ksykora@nerdery.com>
Date: Wed, 14 May 2014 10:00:42 -0500
Subject: [PATCH 2/5] No longer enabling Microsoft updates by default

---
 answer_files/2008_r2_core/Autounattend.xml | 3 +++
 answer_files/2012/Autounattend.xml         | 3 +++
 answer_files/2012_r2/Autounattend.xml      | 3 +++
 answer_files/2012_r2_core/Autounattend.xml | 3 +++
 answer_files/7/Autounattend.xml            | 3 +++
 answer_files/81/Autounattend.xml           | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/answer_files/2008_r2_core/Autounattend.xml b/answer_files/2008_r2_core/Autounattend.xml
index 7493415a..96e1f5a2 100644
--- a/answer_files/2008_r2_core/Autounattend.xml
+++ b/answer_files/2008_r2_core/Autounattend.xml
@@ -262,11 +262,14 @@
                     <Order>27</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
+                <!--
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>28</Order>
                     <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
+                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/2012/Autounattend.xml b/answer_files/2012/Autounattend.xml
index bbf89b07..75afdb85 100644
--- a/answer_files/2012/Autounattend.xml
+++ b/answer_files/2012/Autounattend.xml
@@ -231,11 +231,14 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
+                <!--
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>22</Order>
                     <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
+                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/2012_r2/Autounattend.xml b/answer_files/2012_r2/Autounattend.xml
index 281e2a8e..ef99145a 100644
--- a/answer_files/2012_r2/Autounattend.xml
+++ b/answer_files/2012_r2/Autounattend.xml
@@ -228,11 +228,14 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
+                <!--
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>22</Order>
                     <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
+                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/2012_r2_core/Autounattend.xml b/answer_files/2012_r2_core/Autounattend.xml
index be930ea1..8ff07e1d 100644
--- a/answer_files/2012_r2_core/Autounattend.xml
+++ b/answer_files/2012_r2_core/Autounattend.xml
@@ -228,11 +228,14 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
+                <!--
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>22</Order>
                     <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
+                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/7/Autounattend.xml b/answer_files/7/Autounattend.xml
index 764d6cf8..8fb874f4 100644
--- a/answer_files/7/Autounattend.xml
+++ b/answer_files/7/Autounattend.xml
@@ -227,11 +227,14 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
+                <!--
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>22</Order>
                     <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
+                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
diff --git a/answer_files/81/Autounattend.xml b/answer_files/81/Autounattend.xml
index 3f804e19..4182dbea 100644
--- a/answer_files/81/Autounattend.xml
+++ b/answer_files/81/Autounattend.xml
@@ -224,11 +224,14 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
+                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
+                <!--
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>22</Order>
                     <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
+                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">

From cbfce3193de92117ba5a8c6c428d31a26650cdf0 Mon Sep 17 00:00:00 2001
From: Joe Fitzgerald <jfitzgerald@gopivotal.com>
Date: Sat, 17 May 2014 11:44:14 -0600
Subject: [PATCH 3/5] Format JSON

---
 windows_2008_r2.json      | 175 ++++++++++++++++++++------------------
 windows_2008_r2_core.json | 149 ++++++++++++++++++--------------
 windows_2012.json         | 173 ++++++++++++++++++++-----------------
 windows_2012_r2.json      | 175 ++++++++++++++++++++------------------
 windows_2012_r2_core.json | 175 ++++++++++++++++++++------------------
 windows_7.json            | 173 ++++++++++++++++++++-----------------
 windows_81.json           | 169 +++++++++++++++++++-----------------
 7 files changed, 644 insertions(+), 545 deletions(-)

diff --git a/windows_2008_r2.json b/windows_2008_r2.json
index b386efde..e61ce40a 100644
--- a/windows_2008_r2.json
+++ b/windows_2008_r2.json
@@ -1,83 +1,96 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/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,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "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,
-            "floppy_files": [
-                "./answer_files/2008_r2/Autounattend.xml",
-                "./scripts/microsoft-updates.bat",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://download.microsoft.com/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,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2008_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/2008_r2/Autounattend.xml",
-                "./scripts/microsoft-updates.bat",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat",
-                "./scripts/compact.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_2008_r2_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_2008_r2.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/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,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "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,
+      "floppy_files": [
+        "./answer_files/2008_r2/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/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,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2008_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2008_r2/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat",
+        "./scripts/compact.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2008_r2_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2008_r2.template"
+    }
+  ]
 }
diff --git a/windows_2008_r2_core.json b/windows_2008_r2_core.json
index c2750116..b842e9ed 100644
--- a/windows_2008_r2_core.json
+++ b/windows_2008_r2_core.json
@@ -1,59 +1,73 @@
 {
-  "builders": [{
-    "type": "vmware-iso",
-    "iso_url": "http://download.microsoft.com/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,
-    "boot_wait": "2m",
-    "ssh_username": "vagrant",
-    "ssh_password": "vagrant",
-    "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,
-    "floppy_files": [
-      "./answer_files/2008_r2_core/Autounattend.xml",
-      "./scripts/microsoft-updates.bat",
-      "./scripts/win-updates.ps1",
-      "./scripts/openssh.ps1"
-    ],
-    "vmx_data": {
-      "RemoteDisplay.vnc.enabled": "false",
-      "RemoteDisplay.vnc.port": "5900",
-      "memsize": "2048",
-      "numvcpus": "2",
-	  "scsi0.virtualDev": "lsisas1068"
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/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,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "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,
+      "floppy_files": [
+        "./answer_files/2008_r2_core/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/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,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2008_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2008_r2_core/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
     }
-  }, {
-    "type": "virtualbox-iso",
-    "iso_url": "http://download.microsoft.com/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,
-    "boot_wait": "2m",
-    "ssh_username": "vagrant",
-    "ssh_password": "vagrant",
-    "ssh_wait_timeout": "2h",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-    "guest_os_type": "Windows2008_64",
-    "disk_size": 61440,
-    "floppy_files": [
-      "./answer_files/2008_r2_core/Autounattend.xml",
-      "./scripts/microsoft-updates.bat",
-      "./scripts/win-updates.ps1",
-      "./scripts/openssh.ps1",
-      "./scripts/oracle-cert.cer"
-    ],
-    "vboxmanage": [
-      ["modifyvm", "{{.Name}}", "--memory", "2048"],
-      ["modifyvm", "{{.Name}}", "--cpus", "2"]
-    ]
-  }],
-  "provisioners": [{
+  ],
+  "provisioners": [
+    {
       "type": "shell",
       "remote_path": "/tmp/script.bat",
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
@@ -62,14 +76,21 @@
         "./scripts/chef.bat",
         "./scripts/vagrant-ssh.bat",
         "./scripts/compact.bat"
-     ]
-    }, {
-      "type": "shell", "inline": ["rm -rf /tmp/*"]
-    }],
-  "post-processors": [{
-    "type": "vagrant",
-    "keep_input_artifact": false,
-    "output": "windows_2008_r2_core_{{.Provider}}.box",
-    "vagrantfile_template": "vagrantfile-windows_2008_r2.template"
-  }]
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2008_r2_core_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2008_r2.template"
+    }
+  ]
 }
diff --git a/windows_2012.json b/windows_2012.json
index eb46dace..ec718128 100644
--- a/windows_2012.json
+++ b/windows_2012.json
@@ -1,82 +1,95 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/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,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "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,
-            "floppy_files": [
-                "./answer_files/2012/Autounattend.xml",
-                "./scripts/microsoft-updates.bat",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://download.microsoft.com/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,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2012_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/2012/Autounattend.xml",
-                "./scripts/microsoft-updates.bat",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_2012_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_2012.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/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,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "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,
+      "floppy_files": [
+        "./answer_files/2012/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/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,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2012_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2012/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2012_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2012.template"
+    }
+  ]
 }
diff --git a/windows_2012_r2.json b/windows_2012_r2.json
index 268ee269..c263a539 100644
--- a/windows_2012_r2.json
+++ b/windows_2012_r2.json
@@ -1,83 +1,96 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/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",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "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,
-            "floppy_files": [
-                "./answer_files/2012_r2/Autounattend.xml",
-                "./scripts/microsoft-updates.bat",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://download.microsoft.com/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",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2012_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/2012_r2/Autounattend.xml",
-                "./scripts/microsoft-updates.bat",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat",
-                "./scripts/compact.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_2012_r2_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_2012_r2.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/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",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "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,
+      "floppy_files": [
+        "./answer_files/2012_r2/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/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",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2012_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2012_r2/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat",
+        "./scripts/compact.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2012_r2_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2012_r2.template"
+    }
+  ]
 }
diff --git a/windows_2012_r2_core.json b/windows_2012_r2_core.json
index 0beee13a..e0cf7dac 100644
--- a/windows_2012_r2_core.json
+++ b/windows_2012_r2_core.json
@@ -1,83 +1,96 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/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",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "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,
-            "floppy_files": [
-                "./answer_files/2012_r2_core/Autounattend.xml",
-                "./scripts/microsoft-updates.bat",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://download.microsoft.com/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",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2012_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/2012_r2_core/Autounattend.xml",
-                "./scripts/microsoft-updates.bat",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat",
-                "./scripts/compact.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_2012_r2_core_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_2012_r2.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/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",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "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,
+      "floppy_files": [
+        "./answer_files/2012_r2_core/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/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",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2012_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2012_r2_core/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat",
+        "./scripts/compact.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2012_r2_core_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2012_r2.template"
+    }
+  ]
 }
diff --git a/windows_7.json b/windows_7.json
index b64236cd..072df8ac 100644
--- a/windows_7.json
+++ b/windows_7.json
@@ -1,82 +1,95 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "1d0d239a252cb53e466d39e752b17c28",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "4h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "windows7-64",
-            "tools_upload_flavor": "windows",
-            "disk_size": 61440,
-            "vnc_port_min": 5900,
-            "vnc_port_max": 5980,
-            "floppy_files": [
-                "./answer_files/7/Autounattend.xml",
-                "./scripts/dis-updates.ps1",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "1d0d239a252cb53e466d39e752b17c28",
-            "headless": false,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "4h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows7_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/7/Autounattend.xml",
-                "./scripts/dis-updates.ps1",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_7_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_7.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "1d0d239a252cb53e466d39e752b17c28",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "4h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "windows7-64",
+      "tools_upload_flavor": "windows",
+      "disk_size": 61440,
+      "vnc_port_min": 5900,
+      "vnc_port_max": 5980,
+      "floppy_files": [
+        "./answer_files/7/Autounattend.xml",
+        "./scripts/dis-updates.ps1",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "1d0d239a252cb53e466d39e752b17c28",
+      "headless": false,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "4h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows7_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/7/Autounattend.xml",
+        "./scripts/dis-updates.ps1",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_7_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_7.template"
+    }
+  ]
 }
diff --git a/windows_81.json b/windows_81.json
index 8e281664..f3086f3c 100644
--- a/windows_81.json
+++ b/windows_81.json
@@ -1,80 +1,93 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "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,
-            "floppy_files": [
-                "./answer_files/81/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2012_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/81/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_81_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_81.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "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,
+      "floppy_files": [
+        "./answer_files/81/Autounattend.xml",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2012_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/81/Autounattend.xml",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_81_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_81.template"
+    }
+  ]
 }

From 280c817779b6b6c8a83e72b3160b9cd54232ddcb Mon Sep 17 00:00:00 2001
From: Joe Fitzgerald <jfitzgerald@gopivotal.com>
Date: Sat, 17 May 2014 11:55:52 -0600
Subject: [PATCH 4/5] Remove Disable Windows Updates, Enable Microsoft Updates
 By Default - Disable Windows Updates can be run as a provisioner step; it's
 not required at this point. If you don't want Windows Updates at all,
 uncomment the "WITHOUT WINDOWS UPDATES" section and comment the section "WITH
 WINDOWS UPDATES"

---
 answer_files/2008_r2/Autounattend.xml      | 10 +++++-----
 answer_files/2008_r2_core/Autounattend.xml | 13 +++++--------
 answer_files/2012/Autounattend.xml         | 13 +++++--------
 answer_files/2012_r2/Autounattend.xml      | 13 +++++--------
 answer_files/2012_r2_core/Autounattend.xml | 13 +++++--------
 answer_files/7/Autounattend.xml            | 13 ++-----------
 answer_files/81/Autounattend.xml           | 13 ++-----------
 7 files changed, 29 insertions(+), 59 deletions(-)

diff --git a/answer_files/2008_r2/Autounattend.xml b/answer_files/2008_r2/Autounattend.xml
index 0eb29777..efef41ea 100644
--- a/answer_files/2008_r2/Autounattend.xml
+++ b/answer_files/2008_r2/Autounattend.xml
@@ -226,11 +226,6 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
-                    <Order>22</Order>
-                    <Description>Enable Microsoft Updates</Description>
-                </SynchronousCommand>
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
@@ -242,6 +237,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <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>
diff --git a/answer_files/2008_r2_core/Autounattend.xml b/answer_files/2008_r2_core/Autounattend.xml
index 96e1f5a2..f77ec70c 100644
--- a/answer_files/2008_r2_core/Autounattend.xml
+++ b/answer_files/2008_r2_core/Autounattend.xml
@@ -262,14 +262,6 @@
                     <Order>27</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
-                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
-                <!--
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
-                    <Order>28</Order>
-                    <Description>Enable Microsoft Updates</Description>
-                </SynchronousCommand>
-                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
@@ -281,6 +273,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <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>
diff --git a/answer_files/2012/Autounattend.xml b/answer_files/2012/Autounattend.xml
index 75afdb85..660b485e 100644
--- a/answer_files/2012/Autounattend.xml
+++ b/answer_files/2012/Autounattend.xml
@@ -231,14 +231,6 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
-                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
-                <!--
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
-                    <Order>22</Order>
-                    <Description>Enable Microsoft Updates</Description>
-                </SynchronousCommand>
-                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
@@ -250,6 +242,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <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>
diff --git a/answer_files/2012_r2/Autounattend.xml b/answer_files/2012_r2/Autounattend.xml
index ef99145a..e82a3017 100644
--- a/answer_files/2012_r2/Autounattend.xml
+++ b/answer_files/2012_r2/Autounattend.xml
@@ -228,14 +228,6 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
-                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
-                <!--
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
-                    <Order>22</Order>
-                    <Description>Enable Microsoft Updates</Description>
-                </SynchronousCommand>
-                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
@@ -247,6 +239,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <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>
diff --git a/answer_files/2012_r2_core/Autounattend.xml b/answer_files/2012_r2_core/Autounattend.xml
index 8ff07e1d..74924543 100644
--- a/answer_files/2012_r2_core/Autounattend.xml
+++ b/answer_files/2012_r2_core/Autounattend.xml
@@ -228,14 +228,6 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
-                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
-                <!--
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
-                    <Order>22</Order>
-                    <Description>Enable Microsoft Updates</Description>
-                </SynchronousCommand>
-                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
@@ -247,6 +239,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <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>
diff --git a/answer_files/7/Autounattend.xml b/answer_files/7/Autounattend.xml
index 8fb874f4..1b179610 100644
--- a/answer_files/7/Autounattend.xml
+++ b/answer_files/7/Autounattend.xml
@@ -227,14 +227,6 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
-                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
-                <!--
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
-                    <Order>22</Order>
-                    <Description>Enable Microsoft Updates</Description>
-                </SynchronousCommand>
-                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
@@ -247,10 +239,9 @@
                 <!-- 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:\dis-updates.ps1</CommandLine>
-                    <Description>Disable Windows Updates</Description>
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>98</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
+                    <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>
diff --git a/answer_files/81/Autounattend.xml b/answer_files/81/Autounattend.xml
index 4182dbea..a511c16d 100644
--- a/answer_files/81/Autounattend.xml
+++ b/answer_files/81/Autounattend.xml
@@ -224,14 +224,6 @@
                     <Order>21</Order>
                     <Description>Disable Hibernation Mode</Description>
                 </SynchronousCommand>
-                <!-- ENABLE WINDOWS AND MICROSOFT UPDATES -->
-                <!--
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
-                    <Order>22</Order>
-                    <Description>Enable Microsoft Updates</Description>
-                </SynchronousCommand>
-                -->
                 <!-- WITHOUT WINDOWS UPDATES -->
                 <!--
                 <SynchronousCommand wcm:action="add">
@@ -244,10 +236,9 @@
                 <!-- 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:\dis-updates.ps1</CommandLine>
-                    <Description>Disable Windows Updates</Description>
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>98</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
+                    <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>

From 15b74e4d9f5a8a740424d0d5b4a46b4ec6cb2eb9 Mon Sep 17 00:00:00 2001
From: Joe Fitzgerald <jfitzgerald@gopivotal.com>
Date: Sat, 17 May 2014 11:57:48 -0600
Subject: [PATCH 5/5] :abc: Update CHANGELOG for v1.19

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e97c4976..3514584a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
+## v1.19 (May 17th, 2014)
+
+* Enable Microsoft Updates by default (#60)
+* Remove disable Windows Updates script from Windows 7 and 8.1; you can run this as a provioner step, and use Autounattend sections to achieve the same outcome
+
 ## v1.18 (May 16th, 2014)
+
 * Require Vagrant 1.6.2 (#57)
 * Remove WinRM port forward, as it's done automatically in Vagrant 1.6.2+ (#57)
 * Update chef-client source to getchef.com (#63)