From 890c00d6b809d0d908903fbf1a0ec5ceca8b54ad Mon Sep 17 00:00:00 2001
From: selias <samelias@cisco.com>
Date: Fri, 22 Sep 2017 10:49:28 +0200
Subject: Update disk-image-builder scripts to allow IPv6

Change-Id: I28ed08689db97eabc21726afa9d977fcda526dfb
Signed-off-by: selias <samelias@cisco.com>
---
 .../ubuntu/listmaker/ubuntu-16.04.1.json           | 57 +++++++++++++---------
 1 file changed, 33 insertions(+), 24 deletions(-)

(limited to 'resources/tools/disk-image-builder/ubuntu/listmaker/ubuntu-16.04.1.json')

diff --git a/resources/tools/disk-image-builder/ubuntu/listmaker/ubuntu-16.04.1.json b/resources/tools/disk-image-builder/ubuntu/listmaker/ubuntu-16.04.1.json
index 044d1b9a60..c88ab4172b 100644
--- a/resources/tools/disk-image-builder/ubuntu/listmaker/ubuntu-16.04.1.json
+++ b/resources/tools/disk-image-builder/ubuntu/listmaker/ubuntu-16.04.1.json
@@ -26,32 +26,41 @@
       "iso_target_path" : "build/ubuntu-16.04.1-server-amd64.iso",
       "output_directory": "{{user `outputdir`}}",
       "headless": "true",
+      "boot_wait": "30s",
+      "qemuargs": [
+       ],
       "boot_command":
         [
-          "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "/install/vmlinuz<wait>",
-          " auto<wait>",
-          " console-setup/ask_detect=false<wait>",
-          " console-setup/layoutcode=us<wait>",
-          " console-setup/modelcode=pc105<wait>",
-          " debconf/frontend=noninteractive<wait>",
-          " debian-installer=en_US<wait>",
-          " fb=false<wait>",
-          " initrd=/install/initrd.gz<wait>",
-          " kbd-chooser/method=us<wait>",
-          " keyboard-configuration/layout=USA<wait>",
-          " keyboard-configuration/variant=USA<wait>",
-          " locale=en_US<wait>",
-          " netcfg/get_domain=vm<wait>",
-          " netcfg/get_hostname=qemu<wait>",
-          " grub-installer/bootdev=/dev/vda<wait>",
-          " noapic<wait>",
-          " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg",
-          " -- <wait>",
-           "<enter><wait>"
+          "<enter><wait>",
+          "<f6><esc>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs>",
+          "/install/vmlinuz",
+          " auto",
+          " console-setup/ask_detect=false",
+          " console-setup/layoutcode=us",
+          " console-setup/modelcode=pc105",
+          " debconf/frontend=noninteractive",
+          " debian-installer=en_US",
+          " fb=false",
+          " initrd=/install/initrd.gz",
+          " kbd-chooser/method=us",
+          " keyboard-configuration/layout=USA",
+          " keyboard-configuration/variant=USA",
+          " locale=en_US",
+          " netcfg/get_domain=vm",
+          " netcfg/get_hostname=qemu",
+          " grub-installer/bootdev=/dev/vda",
+          " noapic",
+          " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg --- ",
+          "<enter>"
         ]
     }
   ],
-- 
cgit 1.2.3-korg