summaryrefslogtreecommitdiff
path: root/roles/installer/ubuntu/autoinstall
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-09-10 04:04:15 +0200
committerChristian Pointner <equinox@spreadspace.org>2022-09-10 04:04:15 +0200
commite60004af6ed51ec211ebffaddd79f81f0b239c8f (patch)
tree61d2de13ef85d9c37b2563a4354e22913106dfad /roles/installer/ubuntu/autoinstall
parentcore/cpu-microcode: don't do anything on non x86 hardware (diff)
raspios: further cleanup default install
Diffstat (limited to 'roles/installer/ubuntu/autoinstall')
-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 4d83c6b2..496363a9 100644
--- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
+++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
@@ -217,7 +217,7 @@ autoinstall:
{% endif %}
- [ rm, -rf, /etc/cloud, /var/lib/cloud ]
- [ apt-get, -y, -q, auto-remove ]
- - [ bash, -c, 'dpkg -l | grep "^rc" | awk "{ print(\$2) }" | xargs dpkg -P' ]
+ - [ bash, -c, 'dpkg -l | grep "^rc" | awk "{ print(\$2) }" | xargs -r dpkg -P' ]
- [ sed, '/^PasswordAuthentication /d', -i, '/etc/ssh/sshd_config' ]
{% if ubuntu_autoinstall_virtual_machine %}
- [ poweroff ]
@@ -256,7 +256,7 @@ autoinstall:
- curtin in-target --target=/target -- env SUDO_FORCE_REMOVE=yes apt-get -y -q purge sudo
{% endif %}
- curtin in-target --target=/target -- apt-get -y -q autoremove
- - curtin in-target --target=/target -- bash -c 'dpkg -l | grep "^rc" | awk "{ print(\$2) }" | xargs dpkg -P'
+ - curtin in-target --target=/target -- bash -c 'dpkg -l | grep "^rc" | awk "{ print(\$2) }" | xargs -r dpkg -P'
{% if ubuntu_autoinstall_desktop is undefined %}
{# purging the snapd package here would trigger a bug in den postrm script because some filesystems in /run/ can not be unmounted... #}
{# to workadound this issue we only remove the package here and rely on cloud-init to fully purge it on first boot (see user-data: above) #}