Adjust shutdown timeout #139

gusztavvargadr · Oct 6, 2019 · 5d51c69 · 5d51c69
1 parent 7e6024e
commit 5d51c69
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/src/w/packer/builders/hyperv-iso/template.json b/src/w/packer/builders/hyperv-iso/template.json
@@ -26,7 +26,8 @@
       "ssh_timeout": "{{user `hyperv_ssh_timeout`}}",
       "guest_additions_mode": "{{user `hyperv_guest_additions_mode`}}",
       "shutdown_command": "{{user `hyperv_shutdown_command`}}",
+      "shutdown_timeout": "{{user `hyperv_shutdown_timeout`}}",
       "output_directory": "{{user `output_directory`}}/build"
     }
   ]
-}
+}
diff --git a/src/w/packer/builders/hyperv-vmcx/template.json b/src/w/packer/builders/hyperv-vmcx/template.json
@@ -21,7 +21,8 @@
       "ssh_timeout": "{{user `hyperv_ssh_timeout`}}",
       "guest_additions_mode": "{{user `hyperv_guest_additions_mode`}}",
       "shutdown_command": "{{user `hyperv_shutdown_command`}}",
+      "shutdown_timeout": "{{user `hyperv_shutdown_timeout`}}",
       "output_directory": "{{user `output_directory`}}/build"
     }
   ]
-}
+}
diff --git a/src/w/packer/builders/hyperv/template.json b/src/w/packer/builders/hyperv/template.json
@@ -15,7 +15,8 @@
     "hyperv_ssh_password": "Packer42-",
     "hyperv_ssh_timeout": "30m",
     "hyperv_guest_additions_mode": "disable",
-    "hyperv_shutdown_command": "C:/Windows/Setup/packer/shutdown.cmd"
+    "hyperv_shutdown_command": "C:/Windows/Setup/packer/shutdown.cmd",
+    "hyperv_shutdown_timeout": "10m"
   },
   "provisioners": [
     {

diff --git a/src/w/packer/builders/virtualbox-iso/template.json b/src/w/packer/builders/virtualbox-iso/template.json
@@ -36,8 +36,9 @@
       "ssh_timeout": "{{user `virtualbox_ssh_timeout`}}",
       "guest_additions_mode": "{{user `virtualbox_guest_additions_mode`}}",
       "shutdown_command": "{{user `virtualbox_shutdown_command`}}",
+      "shutdown_timeout": "{{user `virtualbox_shutdown_timeout`}}",
       "post_shutdown_delay": "{{user `virtualbox_post_shutdown_delay`}}",
       "output_directory": "{{user `output_directory`}}/build"
     }
   ]
-}
+}
diff --git a/src/w/packer/builders/virtualbox-ovf/template.json b/src/w/packer/builders/virtualbox-ovf/template.json
@@ -29,8 +29,9 @@
       "ssh_timeout": "{{user `virtualbox_ssh_timeout`}}",
       "guest_additions_mode": "{{user `virtualbox_guest_additions_mode`}}",
       "shutdown_command": "{{user `virtualbox_shutdown_command`}}",
+      "shutdown_timeout": "{{user `virtualbox_shutdown_timeout`}}",
       "post_shutdown_delay": "{{user `virtualbox_post_shutdown_delay`}}",
       "output_directory": "{{user `output_directory`}}/build"
     }
   ]
-}
+}
diff --git a/src/w/packer/builders/virtualbox/template.json b/src/w/packer/builders/virtualbox/template.json
@@ -12,6 +12,7 @@
     "virtualbox_ssh_timeout": "30m",
     "virtualbox_guest_additions_mode": "disable",
     "virtualbox_shutdown_command": "C:/Windows/Setup/packer/shutdown.cmd",
+    "virtualbox_shutdown_timeout": "10m",
     "virtualbox_post_shutdown_delay": "5s"
   },
   "provisioners": [