From 0085933dabbe4d36e3e1bf0a5a7e1f09e5c3645c Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 19 Jan 2024 01:47:04 +0100
Subject: vm/guest: some fixes for ubuntu installer, still not fully working

---
 roles/installer/openbsd/fetch/vars/main.yml                     | 3 +++
 roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 | 3 ++-
 roles/installer/ubuntu/base/tasks/main.yml                      | 4 +++-
 roles/installer/ubuntu/fetch/tasks/main.yml                     | 5 +++--
 4 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'roles/installer')

diff --git a/roles/installer/openbsd/fetch/vars/main.yml b/roles/installer/openbsd/fetch/vars/main.yml
index f5910ce1..6abb571e 100644
--- a/roles/installer/openbsd/fetch/vars/main.yml
+++ b/roles/installer/openbsd/fetch/vars/main.yml
@@ -20,3 +20,6 @@ openbsd_installer_signing_keys:
   "7.3": |
     untrusted comment: openbsd 7.3 public key
     RWQS90bYzZ4XFms5z9OodrFABHMQnW6htU+4Tmp88NuQiTEezMm2cQ3K
+  "7.4": |
+    untrusted comment: openbsd 7.4 public key
+    RWRoyQmAD08ajTqgzK3UcWaVlwaJMckH9/CshU8Md5pN1GoIrcBdTF+c
diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
index 93b952b6..125e8d82 100644
--- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
+++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
@@ -225,6 +225,7 @@ autoinstall:
     - [ apt-get, -y, -q, auto-remove ]
     - [ bash, -c, 'dpkg -l | grep "^rc" | awk "{ print(\$2) }" | xargs -r dpkg -P' ]
     - [ sed, '/^PasswordAuthentication /d', -i, '/etc/ssh/sshd_config' ]
+    - [ rm, -f, '/etc/ssh/sshd_config.d/50-cloud-init.conf' ]
 {% if ubuntu_autoinstall_poweroff_when_done %}
     - [ poweroff ]
 {% else %}
@@ -253,7 +254,7 @@ autoinstall:
   - curtin in-target --target=/target -- apt-get -y -q purge systemd-oomd
 {% if ubuntu_autoinstall_desktop is undefined %}
   - curtin in-target --target=/target -- apt-mark manual iputils-ping isc-dhcp-client netcat-openbsd netplan.io sudo
-  - curtin in-target --target=/target -- apt-get -y -q purge policykit-1 ubuntu-minimal unattended-upgrades sound-theme-freedesktop thin-provisioning-tools cryptsetup byobu open-iscsi btrfs-progs pollinate lxd-agent-loader
+  - curtin in-target --target=/target -- apt-get -y -q purge policykit-1 ubuntu-minimal unattended-upgrades sound-theme-freedesktop thin-provisioning-tools cryptsetup byobu open-iscsi btrfs-progs pollinate lxd-agent-loader ufw
 {%   if install.disks.primary != "software-raid" %}
   - curtin in-target --target=/target -- apt-get -y -q purge mdadm
 {%   endif %}
diff --git a/roles/installer/ubuntu/base/tasks/main.yml b/roles/installer/ubuntu/base/tasks/main.yml
index c48ed4b5..d6a4cc7a 100644
--- a/roles/installer/ubuntu/base/tasks/main.yml
+++ b/roles/installer/ubuntu/base/tasks/main.yml
@@ -1,7 +1,9 @@
 ---
 - name: install gpgv
   apt:
-    name: gpgv
+    name:
+    - gpgv
+    - xorriso
     state: present
 
 - name: prepare directory keyrings
diff --git a/roles/installer/ubuntu/fetch/tasks/main.yml b/roles/installer/ubuntu/fetch/tasks/main.yml
index ff87fb64..1ddb283a 100644
--- a/roles/installer/ubuntu/fetch/tasks/main.yml
+++ b/roles/installer/ubuntu/fetch/tasks/main.yml
@@ -4,11 +4,11 @@
 
 - name: compute target directory
   set_fact:
-    ubuntu_installer_target_dir: "{{ installer_base_path }}/{{ ubuntu_installer_codename }}/{{ ubuntu_installer_version }}-{{ ubuntu_installer_variant }}"
+    ubuntu_installer_target_dir: "{{ installer_base_path }}/ubuntu-{{ ubuntu_installer_codename }}/{{ ubuntu_installer_version }}-{{ ubuntu_installer_variant }}"
 
 - name: prepare directories for installer files
   file:
-    name: "{{ ubuntu_installer_target_dir }}"
+    name: "{{ ubuntu_installer_target_dir }}/.tmp"
     state: directory
 
 - name: find download location for release version
@@ -43,6 +43,7 @@
     get_url:
       url: "{{ ubuntu_installer_base_url }}/{{ ubuntu_installer_filename }}"
       dest: "{{ ubuntu_installer_target_dir }}/{{ ubuntu_installer_filename }}"
+      tmp_dest: "{{ ubuntu_installer_target_dir }}/.tmp/"
       checksum: "sha256:{{ ubuntu_installer_sha256sum.stdout.split(' ') | first }}"
       force: "{{ ubuntu_installer_force_download }}"
 
-- 
cgit v1.2.3