make the reboots explicit

provision-guest-additions.sh

@@ -45,6 +45,3 @@ else
 echo 'ERROR: Unknown VM host.'
 exit 1
 fi
-
-# reboot.
-nohup bash -c "ps -eo pid,comm | awk '/sshd/{print \$1}' | xargs kill; sync; reboot"

provision.sh

@@ -4,10 +4,6 @@ set -euxo pipefail
 # wait for cloud-init to finish.
 cloud-init status --long --wait
 
-# let the sudo group members use root permissions without a password.
-# NB d-i automatically adds vagrant into the sudo group.
-sed -i -E 's,^%sudo\s+.+,%sudo ALL=(ALL) NOPASSWD:ALL,g' /etc/sudoers
-
 # install the vagrant public key.
 # NB vagrant will replace it on the first run.
 install -d -m 700 /home/vagrant/.ssh

reboot.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -euxo pipefail
+
+reboot --force

ubuntu-vsphere.pkr.hcl

@@ -119,11 +119,34 @@ build {
   sources = ["source.vsphere-iso.ubuntu-amd64"]
 
   provisioner "shell" {
-    execute_command   = "echo vagrant | sudo -S bash {{ .Path }}"
-    expect_disconnect = true
+    execute_command = "echo vagrant | sudo -S {{ .Vars }} bash {{ .Path }}"
     scripts = [
       "upgrade.sh",
+    ]
+  }
+
+  provisioner "shell" {
+    expect_disconnect = true
+    scripts = [
+      "reboot.sh",
+    ]
+  }
+
+  provisioner "shell" {
+    scripts = [
       "provision-guest-additions.sh",
+    ]
+  }
+
+  provisioner "shell" {
+    expect_disconnect = true
+    scripts = [
+      "reboot.sh",
+    ]
+  }
+
+  provisioner "shell" {
+    scripts = [
       "provision.sh",
     ]
   }

ubuntu.pkr.hcl

@@ -201,11 +201,38 @@ build {
   ]
 
   provisioner "shell" {
-    execute_command   = "echo vagrant | sudo -S {{ .Vars }} bash {{ .Path }}"
-    expect_disconnect = true
+    execute_command = "echo vagrant | sudo -S {{ .Vars }} bash {{ .Path }}"
     scripts = [
       "upgrade.sh",
+    ]
+  }
+
+  provisioner "shell" {
+    execute_command = "sudo -S {{ .Vars }} bash {{ .Path }}"
+    expect_disconnect = true
+    scripts = [
+      "reboot.sh",
+    ]
+  }
+
+  provisioner "shell" {
+    execute_command = "sudo -S {{ .Vars }} bash {{ .Path }}"
+    scripts = [
       "provision-guest-additions.sh",
+    ]
+  }
+
+  provisioner "shell" {
+    execute_command = "sudo -S {{ .Vars }} bash {{ .Path }}"
+    expect_disconnect = true
+    scripts = [
+      "reboot.sh",
+    ]
+  }
+
+  provisioner "shell" {
+    execute_command = "sudo -S {{ .Vars }} bash {{ .Path }}"
+    scripts = [
       "provision.sh",
     ]
   }

upgrade.sh

@@ -4,12 +4,13 @@ set -euxo pipefail
 # wait for cloud-init to finish.
 cloud-init status --long --wait
 
+# let the sudo group members use root permissions without a password.
+# NB d-i automatically added the vagrant user into the sudo group.
+sed -i -E 's,^%sudo\s+.+,%sudo ALL=(ALL) NOPASSWD:ALL,g' /etc/sudoers
+
 # configure apt for non-interactive mode.
 export DEBIAN_FRONTEND=noninteractive
 
 # upgrade.
 apt-get update
 apt-get dist-upgrade -y
-
-# reboot.
-nohup bash -c "ps -eo pid,comm | awk '/sshd/{print \$1}' | xargs kill; sync; reboot"