Remove crufty files after minimize-manual

minimize-manual would be creating those files again, and other
parts may be creating them, so best to do the cleanup at the
very end.

LP: #1826377
This commit is contained in:
Julian Andres Klode 2019-04-25 11:40:08 +02:00
parent 5566c26c63
commit 82870b1185
2 changed files with 10 additions and 3 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.542.2) UNRELEASED; urgency=medium
* Remove crufty files after minimize-manual (LP: #1826377)
-- Julian Andres Klode <juliank@ubuntu.com> Thu, 25 Apr 2019 11:50:45 +0200
livecd-rootfs (2.542.1) cosmic; urgency=medium
[ Cody Shepherd ]

View File

@ -259,9 +259,6 @@ EOF
apt-get -y --purge autoremove"
fi
# remove crufty files that shouldn't be left in an image
rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
Chroot chroot apt clean
if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then
# Save even more size by removing apt lists (that are currently removed
# downstream anyway)
@ -452,6 +449,10 @@ EOF
/usr/share/livecd-rootfs/minimize-manual chroot
# remove crufty files that shouldn't be left in an image
rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
Chroot chroot apt clean
lb binary "$@"
touch binary.success
) 2>&1 | tee binary.log