From ab696a0511e1adee15909369e49bcdee98b16aa7 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 18 Jan 2016 11:13:43 +0100
Subject: fix boot cmd, disk size and ssh timeout for virtualbox

---
 jessie.json | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/jessie.json b/jessie.json
index d7ab526..37b0904 100644
--- a/jessie.json
+++ b/jessie.json
@@ -74,17 +74,23 @@
       {
             "type": "virtualbox-iso",
             "boot_command": [
-                "<esc><esc><enter><wait>",
-                "/install/vmlinuz noapic preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
-                "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ",
-                "hostname={{ .Name }} ",
-                "fb=false debconf/frontend=noninteractive ",
-                "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA keyboard-configuration/variant=USA console-setup/ask_detect=false ",
-                "initrd=/install/initrd.gz -- <enter>"
+              "<esc><wait><wait>",
+              "install auto <wait>",
+              "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>",
+              "debian-installer=en_US locale=en_US.UTF-8 keymap=us <wait>",
+              "netcfg/get_hostname={{ .Name }} <wait>",
+              "netcfg/get_domain={{ user `domain`}} <wait>",
+              "hostname={{user `hostname`}} ",
+              "fb=false debconf/frontend=noninteractive <wait>",
+              "passwd/user-fullname={{user `user`}} <wait>",
+              "passwd/user-password={{user `password`}} <wait>",
+              "passwd/user-password-again={{user `password`}} <wait>",
+              "passwd/username={{user `user`}} <wait>",
+              "<enter><wait>"
             ],
             "headless": true,
             "boot_wait": "10s",
-            "disk_size": 20480,
+            "disk_size": "{{ user `disk_size`}}",
             "guest_os_type": "Debian_64",
             "http_directory": "http",
             "iso_checksum": "d393d17ac6b3113c81186e545c416a00f28ed6e05774284bb5e8f0df39fcbcb9",
@@ -93,7 +99,7 @@
             "ssh_username": "vagrant",
             "ssh_password": "vagrant",
             "ssh_port": 22,
-            "ssh_wait_timeout": "10000s",
+            "ssh_wait_timeout": "15m",
             "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S bash 'shutdown.sh'",
             "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
             "virtualbox_version_file": ".vbox_version"
-- 
cgit v1.2.3