From 477cdee79a54f98eb2ac973ef38138cf417d7bfb Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 9 May 2024 22:00:19 +0200 Subject: make debian/ubuntu os release compare script much more generic --- roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/installer') 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" %} -- cgit v1.2.3