Fix Windows 10 build

basictheprogram · Feb 17, 2017 · 63f2b2c · 63f2b2c
1 parent 15ea66b
commit 63f2b2c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/build_windows_10.sh b/build_windows_10.sh
@@ -5,7 +5,14 @@
 #packer build --only=vmware-iso --var iso_url=~/packer_cache/my/Win10_1607_English_x64.iso --var iso_checksum=99fd8082a609997ae97a514dca22becf20420891 --var autounattend=./tmp/10_pro/Autounattend.xml windows_10.json
 
 # Windows 10 Insider 15025
-packer build --only=vmware-iso --var iso_url=~/packer_cache/Windows10_InsiderPreview_EnterpriseVL_x64_en-us_15025.iso windows_10_insider.json
+#packer build --only=vmware-iso --var iso_url=~/packer_cache/Windows10_InsiderPreview_EnterpriseVL_x64_en-us_15025.iso windows_10_insider.json
 
 # Windows 10 Enterprise MSDN
 #packer build --only=vmware-iso --var iso_url=~/packer_cache/msdn/en_windows_10_enterprise_version_1607_updated_jan_2017_x64_dvd_9714415.iso --var iso_checksum=97164DD5C1C933BAEF89A4BDE93D544256134FE4 --var iso_checksum_type=sha1 --var autounattend=./tmp/10/Autounattend.xml windows_10.json
+
+# Windows 10 Client 15031
+packer build --only=vmware-iso \
+  --var iso_url=~/connect/2017-02-08-windows10-15031-rs2/15031.0.170204-1546.RS2_RELEASE_CLIENTPRO-CORE_OEMRET_X64FRE_EN-US.ISO \
+  --var iso_checksum=d35a1bc67c4cf0226a4e7381752e81a0ab081356 \
+  --var autounattend=./tmp/10_pro_msdn/Autounattend.xml \
+  windows_10.json
diff --git a/windows_10.json b/windows_10.json
@@ -2,6 +2,7 @@
   "builders": [
     {
       "type": "vmware-iso",
+      "vm_name":"windows_10",
       "communicator": "winrm",
       "iso_url": "{{user `iso_url`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
@@ -39,6 +40,7 @@
     },
     {
       "type": "virtualbox-iso",
+      "vm_name":"windows_10",
       "communicator": "winrm",
       "iso_url": "{{user `iso_url`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
@@ -102,7 +104,6 @@
     },
     {
       "type": "powershell",
-      "execute_command": "powershell \"& { {{.Vars}}{{.Path}}; exit $LastExitCode}\"",
       "scripts": [
         "./scripts/set-powerplan.ps1",
         "./scripts/docker/disable-windows-defender.ps1"