From 97241ba1798c8c52a58cfd75066919b10c919edb Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sat, 29 Jun 2024 23:37:19 -0500
Subject: [PATCH] Add Ubuntu 24.04

---
 distros/ubuntu/24.04/amd64.pkrvars.hcl | 20 +++++++++++
 distros/ubuntu/24.04/disc/meta-data    |  0
 distros/ubuntu/24.04/disc/user-data    | 47 ++++++++++++++++++++++++++
 distros/ubuntu/24.04/finalize.sh       | 16 +++++++++
 distros/ubuntu/24.04/qemu.sh           |  6 ++++
 distros/ubuntu/24.04/virtualbox.sh     |  4 +++
 distros/ubuntu/24.04/vmware.sh         |  4 +++
 distros/ubuntu/default.nix             |  4 +++
 8 files changed, 101 insertions(+)
 create mode 100644 distros/ubuntu/24.04/amd64.pkrvars.hcl
 create mode 100644 distros/ubuntu/24.04/disc/meta-data
 create mode 100644 distros/ubuntu/24.04/disc/user-data
 create mode 100644 distros/ubuntu/24.04/finalize.sh
 create mode 100644 distros/ubuntu/24.04/qemu.sh
 create mode 100644 distros/ubuntu/24.04/virtualbox.sh
 create mode 100644 distros/ubuntu/24.04/vmware.sh

diff --git a/distros/ubuntu/24.04/amd64.pkrvars.hcl b/distros/ubuntu/24.04/amd64.pkrvars.hcl
new file mode 100644
index 0000000..b1feba3
--- /dev/null
+++ b/distros/ubuntu/24.04/amd64.pkrvars.hcl
@@ -0,0 +1,20 @@
+distro  = "ubuntu"
+version = "24.04"
+iso = {
+  url      = "http://releases.ubuntu.com/24.04/ubuntu-24.04-live-server-amd64.iso"
+  checksum = "8762f7e74e4d64d72fceb5f70682e6b069932deedb4949c6975d0f0fe0a91be3"
+}
+boot_command = [
+  "e<down><down><down><end><bs><bs><bs>",
+  "console=ttyS0 ",
+  "fsck.mode=skip ",
+  "locale=en_US ",
+  "auto=true ",
+  "priority=critical ",
+  "autoinstall",
+  "<F10>",
+]
+cd_files = [
+  "distros/ubuntu/24.04/disc/*"
+]
+vbox_os_type = "Ubuntu24_64"
diff --git a/distros/ubuntu/24.04/disc/meta-data b/distros/ubuntu/24.04/disc/meta-data
new file mode 100644
index 0000000..e69de29
diff --git a/distros/ubuntu/24.04/disc/user-data b/distros/ubuntu/24.04/disc/user-data
new file mode 100644
index 0000000..4b96996
--- /dev/null
+++ b/distros/ubuntu/24.04/disc/user-data
@@ -0,0 +1,47 @@
+#cloud-config
+# vim: set ft=yaml:
+autoinstall:
+  version: 1
+  network:  # Should disable networking, workaround for unattended-updates failing in install
+    version: 2
+    ethernets:
+      eth0:
+        match:
+          name: e*
+        dhcp4: yes
+        dhcp6: no
+  refresh-installer:
+    update: no
+  keyboard:
+    layout: us
+    toggle: null
+    variant: ''
+  locale: en_US.UTF-8
+  identity:
+    hostname: vagrant
+    username: vagrant
+    password: $6$rounds=4096$mJTRlY/vwPMquLe0$s4Ld3ZnvF.pM86xzbAgQD7Xpi/NMVgyQNb5CEfabFgL6nLRsP56WtwA.o.Jg/xC6HaJmM2p5fCGIo37jmKVRI0
+  ssh:
+    install-server: yes
+    authorized_keys:
+      - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+    allow-pw: yes
+  user-data:
+    disable_root: false
+    package_update: false
+    package_upgrade: false
+  late-commands:
+    - echo 'Defaults:vagrant !requiretty' > /target/etc/sudoers.d/vagrant
+    - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' >> /target/etc/sudoers.d/vagrant
+    - chmod 440 /target/etc/sudoers.d/vagrant
+    - >-
+      curtin in-target --target=/target --
+      bash -c 'if [ "$(systemd-detect-virt)" == "microsoft" ]; then
+        apt-get update;
+        apt-get install -y linux-azure;
+      fi'
+    - curtin in-target --target=/target -- logger "finished late-commands"
+  packages:
+    - ca-certificates
+    - curl
+    - sudo
diff --git a/distros/ubuntu/24.04/finalize.sh b/distros/ubuntu/24.04/finalize.sh
new file mode 100644
index 0000000..f79a717
--- /dev/null
+++ b/distros/ubuntu/24.04/finalize.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -ex
+
+apt remove cloud-init -y
+
+apt update
+apt upgrade -y
+
+# Make sshd faster
+cat << EOF > /etc/ssh/sshd_config.d/00-vagrant_accept_pubkey.conf
+UseDNS no
+PubkeyAcceptedKeyTypes +ssh-rsa
+EOF
+
+# Clean up after ourselves
+apt-get clean
diff --git a/distros/ubuntu/24.04/qemu.sh b/distros/ubuntu/24.04/qemu.sh
new file mode 100644
index 0000000..4ef2dee
--- /dev/null
+++ b/distros/ubuntu/24.04/qemu.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -ex
+
+apt install -y qemu-guest-agent
+systemctl start qemu-guest-agent
+systemctl enable qemu-guest-agent
diff --git a/distros/ubuntu/24.04/virtualbox.sh b/distros/ubuntu/24.04/virtualbox.sh
new file mode 100644
index 0000000..2813d68
--- /dev/null
+++ b/distros/ubuntu/24.04/virtualbox.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+apt install -y virtualbox-guest-utils
diff --git a/distros/ubuntu/24.04/vmware.sh b/distros/ubuntu/24.04/vmware.sh
new file mode 100644
index 0000000..9560300
--- /dev/null
+++ b/distros/ubuntu/24.04/vmware.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+apt install -y open-vm-tools
diff --git a/distros/ubuntu/default.nix b/distros/ubuntu/default.nix
index c0643db..a45aa86 100644
--- a/distros/ubuntu/default.nix
+++ b/distros/ubuntu/default.nix
@@ -14,4 +14,8 @@
 	version = "23.10";
 	arch = "amd64";
 	eol = false;
+} {
+	version = "24.04";
+	arch = "amd64";
+	eol = false;
 } ]