move listchanges removal to where it's needed

listchanges config needs to be be removed before apt is run

Change-Id: I7c49f0cd7abb85e725296b17ecb88f34b50affed
This commit is contained in:
Matthew Thode 2020-05-28 18:40:42 -05:00
parent 54d1f8c479
commit 2aa1a6776a
No known key found for this signature in database
GPG Key ID: 64A37BEAAE19A4E8
1 changed files with 3 additions and 1 deletions

View File

@ -6,6 +6,9 @@ set -e -x
{% include 'templates/prep-scripts/_container_sys_setup.sh.j2' %}
# remove configs that break containers (listchanges is missing)
rm -f /etc/apt/apt.conf.d/20listchanges
export DEBIAN_FRONTEND=noninteractive
apt-get remove -y --purge snap* lxc* lxd* resolvconf* || true
@ -21,7 +24,6 @@ apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--fo
apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
apt-get remove -y --purge mariadb* || true
rm -f /etc/apt/apt.conf.d/20listchanges
rm /etc/machine-id || true
rm /var/lib/dbus/machine-id || true
touch /etc/machine-id