From 8b08ab93764f3fbfa455fde626637cfe9904a36c Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Tue, 3 May 2022 19:47:39 -0500
Subject: [PATCH] Ubuntu 18.04 working

---
 distros/ubuntu-18.04-x86_64.pkrvars.hcl | 19 +++++++++++++++++++
 http/ubuntu/18.04/preseed.cfg           |  8 ++++----
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 distros/ubuntu-18.04-x86_64.pkrvars.hcl

diff --git a/distros/ubuntu-18.04-x86_64.pkrvars.hcl b/distros/ubuntu-18.04-x86_64.pkrvars.hcl
new file mode 100644
index 0000000..c9fce47
--- /dev/null
+++ b/distros/ubuntu-18.04-x86_64.pkrvars.hcl
@@ -0,0 +1,19 @@
+distro = "ubuntu"
+arch = "x86_64"
+version = "18.04"
+iso = {
+	#url = "http://releases.ubuntu.com/18.04/ubuntu-18.04.6-live-server-amd64.iso"
+	#checksum = "6c647b1ab4318e8c560d5748f908e108be654bad1e165f7cf4f3c1fc43995934"
+	url = "http://cdimage.ubuntu.com/ubuntu/releases/18.04/release/ubuntu-18.04.6-server-amd64.iso"
+	checksum = "f5cbb8104348f0097a8e513b10173a07dbc6684595e331cb06f93f385d0aecf6"
+}
+boot_wait = "15s"
+boot_command = [
+      "<esc><wait1>",
+      "<f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+      "auto=true priority=critical ",
+      "DEBIAN_FRONTEND=noninteractive ",
+      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/18.04/preseed.cfg ",
+      "<enter><wait1>"
+]
+ssh_handshake_attempts = 1000
diff --git a/http/ubuntu/18.04/preseed.cfg b/http/ubuntu/18.04/preseed.cfg
index a2dda07..3d1f861 100644
--- a/http/ubuntu/18.04/preseed.cfg
+++ b/http/ubuntu/18.04/preseed.cfg
@@ -1,10 +1,10 @@
-d-i preseed/include string /preseed/ubuntu-server-minimalvm.seed
-d-i preseed/include string ../preseed.cfg
-
 d-i debian-installer/locale string en_US.UTF-8
 d-i debian-installer/language string en
 d-i debian-installer/country string US
 
+d-i preseed/include string /preseed/ubuntu-server-minimalvm.seed
+d-i preseed/include string ../preseed.cfg
+
 d-i console-setup/ask_detect boolean false
 
 d-i keyboard-configuration/model select USA
@@ -16,4 +16,4 @@ d-i grub-installer/bootdev string /dev/vda
 d-i netcfg/choose_interface select auto
 
 d-i mirror/http/mirror select us.archive.ubuntu.com
-d-i mirror/http/proxy string  
+d-i mirror/http/proxy string