From 31c522535020901e65f6370c79df7e0be241e4fb Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 29 May 2024 16:19:03 +0200 Subject: fix ubuntu post-install script and improve cleanup for noble --- roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 index af349e5c..612ba038 100644 --- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 +++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 @@ -225,6 +225,7 @@ autoinstall: write_files: - content: | #!/bin/bash + set -e for i in $(seq 10 -1 1); do echo "waiting $i seconds for cloud-init to finish."; sleep 1; done echo "******************************************************************************" echo "***** getting rid of cloud-init and other crap we neither want nor need! *****" @@ -273,7 +274,7 @@ autoinstall: - curtin in-target --target=/target -- apt-get -y -q purge systemd-oomd {% endif %} {% if (install_codename | ubuntu_release_compare('>=', 'noble')) %} - - curtin in-target --target=/target -- apt-get -y -q purge ubuntu-kernel-accessories + - curtin in-target --target=/target -- apt-get -y -q purge ubuntu-kernel-accessories ubuntu-pro-client lxd-installer {% 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 -- cgit v1.2.3