Updated for Skadi 2019.2

Packer/script/skadi.sh

@@ -2,13 +2,13 @@
 
 date > /etc/box_build_time
 
-SSH_USER=${SSH_USERNAME:-skadi}
-SSH_PASS=${SSH_PASSWORD:-skadi}
-SSH_USER_HOME=${SSH_USER_HOME:-/home/${SSH_USER}}
+SSH_USER=$skadi
+SSH_PASS=$skadi
+SSH_USER_HOME=$/home/$SSH_USER
 
 # Set up sudo
-echo "==> Giving ${SSH_USER} sudo powers"
-echo "${SSH_USER}        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/$SSH_USER
+echo "==> Giving $SSH_USER sudo powers"
+echo "$SSH_USER        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/$SSH_USER
 chmod 440 /etc/sudoers.d/$SSH_USER
 
 # Fix stdin not being a tty

Packer/skadi_build/create_boxes.json

@@ -18,13 +18,15 @@
       "headless": "{{ user `headless` }}"
     },
     {
+      "name": "ova",
+      "vm_name": "{{user `vm_name`}}-{{user `version`}}.",
+      "output_directory": "ova",
       "type": "virtualbox-ovf",
       "source_path": "output-skadi_basebox-virtualbox-iso/skadi_basebox.ovf",
       "ssh_username": "skadi",
       "ssh_password": "skadi",
       "shutdown_command": "sudo shutdown -P now",
       "headless": "{{ user `headless` }}",
-      "output_directory": "ova",
       "format": "ova"
     }
   ],
@@ -55,10 +57,11 @@
     },
     {
       "environment_vars": [
+        "DEBIAN_FRONTEND=noninteractive",
         "SSH_USERNAME=skadi",
         "CDQR_VERSION=4.4.0",
         "DEFAULT_PASSWORDS=true",
-        "INSTALL_BRANCH=esxi_packer",
+        "INSTALL_BRANCH=master",
         "SKADI_HOSTNAME=true",
         "MAKE_SKADI_USER=true",
         "UTC_TIME=true"
@@ -69,11 +72,22 @@
         "../script/sshd.sh",
         "../script/motd.sh",
         "{{user `custom_script` }}",
-        "../script/vagrant.sh",
         "../script/cleanup.sh"
       ],
       "type": "shell",
       "expect_disconnect": "true"
+    },
+    {
+      "environment_vars": [
+        "DEBIAN_FRONTEND=noninteractive"
+      ],
+      "execute_command": "echo '{{ user `ssh_password` }}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
+      "scripts": [
+        "../script/vagrant.sh"
+      ],
+      "type": "shell",
+      "expect_disconnect": "true",
+      "only": ["virtualbox-ovf", "vmware-vmx"]
     }
   ],
   "post-processors": [