summaryrefslogtreecommitdiff
path: root/roles/installer
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2024-05-09 22:00:19 +0200
committerChristian Pointner <equinox@spreadspace.org>2024-05-09 22:00:19 +0200
commit477cdee79a54f98eb2ac973ef38138cf417d7bfb (patch)
treec25b833071c69c7b7cc262111240f130018cbc92 /roles/installer
parentsome more fixes for ubuntu-installer (diff)
make debian/ubuntu os release compare script much more generic
Diffstat (limited to 'roles/installer')
-rw-r--r--roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
index 3d12091e..841ebf63 100644
--- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
+++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
@@ -259,13 +259,13 @@ autoinstall:
- curtin in-target --target=/target -- bash -c "mkdir -p /etc/systemd/system/ssh.socket.d; echo -e '[Socket]\nListenStream=\nListenStream={{ ansible_port }}' > /etc/systemd/system/ssh.socket.d/port.conf"
{% endif %}
- curtin in-target --target=/target -- apt-get -y -q purge multipath-tools open-vm-tools
-{% if not (install_codename | ubuntu_release_before('jammy')) %}
+{% if (install_codename | ubuntu_release_compare('>=', 'jammy')) %}
- curtin in-target --target=/target -- apt-get -y -q purge systemd-oomd
{% endif %}
{% 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 ubuntu-advantage-tools sound-theme-freedesktop thin-provisioning-tools cryptsetup byobu open-iscsi btrfs-progs pollinate lxd-agent-loader ufw
-{% if not (install_codename | ubuntu_release_before('noble')) %}
+{% if (install_codename | ubuntu_release_compare('>=', 'noble')) %}
- curtin in-target --target=/target -- apt-get -y -q purge ubuntu-kernel-accessories
{% endif %}
{% if install.disks.primary != "software-raid" %}