diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-05-08 23:50:15 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-05-08 23:50:15 +0200 |
| commit | 1e98ae0956ddffbec44ce0eac5f9a3e1fa45f434 (patch) | |
| tree | 943ded901681f9ebbc4222f546a146d6de93624a /roles | |
| parent | add raspi5 test host and fix raspios image network config (diff) | |
some more fixes for ubuntu-installer
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/core/base/tasks/Debian.yml | 1 | ||||
| -rw-r--r-- | roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/roles/core/base/tasks/Debian.yml b/roles/core/base/tasks/Debian.yml index fcef9af3..7056a9bc 100644 --- a/roles/core/base/tasks/Debian.yml +++ b/roles/core/base/tasks/Debian.yml @@ -43,6 +43,7 @@ - wget - iotop-c - bwm-ng + - tzdata state: present ## TODO: install dool on newer systems... or all of them. From which package source?? diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 index 1635e84f..3d12091e 100644 --- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 +++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 @@ -259,10 +259,15 @@ 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')) %} - 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')) %} + - curtin in-target --target=/target -- apt-get -y -q purge ubuntu-kernel-accessories +{% endif %} {% if install.disks.primary != "software-raid" %} - curtin in-target --target=/target -- apt-get -y -q purge mdadm {% endif %} |