From cfef5d832b8d4736111c5f5866ab8cc4e5ec5d7e Mon Sep 17 00:00:00 2001
From: AJ Schroeder <6432150+ajschroeder@users.noreply.github.com>
Date: Sat, 29 Jun 2024 10:49:10 -0500
Subject: [PATCH] feat: moved network to separate template, additional packages
 loop, fixed qemu-guest-agent install

---
 .../linux/ubuntu/20-04-lts/data/user-data.pkrtpl.hcl  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/builds/linux/ubuntu/20-04-lts/data/user-data.pkrtpl.hcl b/builds/linux/ubuntu/20-04-lts/data/user-data.pkrtpl.hcl
index 470a254..a279f75 100644
--- a/builds/linux/ubuntu/20-04-lts/data/user-data.pkrtpl.hcl
+++ b/builds/linux/ubuntu/20-04-lts/data/user-data.pkrtpl.hcl
@@ -9,12 +9,11 @@ autoinstall:
         uri: http://archive.ubuntu.com/ubuntu
       - arches: [default]
         uri: http://ports.ubuntu.com/ubuntu-ports
-  early-commands:
-    - sudo systemctl stop ssh
   locale: ${vm_os_language}
   keyboard:
     layout: ${vm_os_keyboard}
-${storage}  
+${storage}
+${network}
   identity:
     hostname: ubuntu-server
     username: ${build_username}
@@ -24,8 +23,10 @@ ${storage}
     allow-pw: true
   packages:
     - openssh-server
-    - qemu-guest-agent
     - cloud-init
+%{ for package in additional_packages ~}
+    - ${package}
+%{ endfor ~}
   user-data:
     disable_root: false
     timezone: ${vm_os_timezone}
@@ -33,3 +34,5 @@ ${storage}
     - sed -i -e 's/^#\?PasswordAuthentication.*/PasswordAuthentication yes/g' /target/etc/ssh/sshd_config
     - echo '${build_username} ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/${build_username}
     - curtin in-target --target=/target -- chmod 440 /etc/sudoers.d/${build_username}
+    - curtin in-target -- apt-get update
+    - curtin in-target -- apt-get install qemu-guest-agent