From 87a26d2cd24fb39bb0094706eda7af2b8d5f9fd3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 25 Apr 2019 11:40:08 +0200 Subject: [PATCH] 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 --- debian/changelog | 6 ++++++ live-build/auto/build | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e6b6f7e..5093eb02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.525.21) UNRELEASED; urgency=medium + + * Remove crufty files after minimize-manual (LP: #1826377) + + -- Julian Andres Klode Fri, 26 Apr 2019 10:39:49 +0200 + livecd-rootfs (2.525.20) bionic; urgency=medium [ Steve Langasek ] diff --git a/live-build/auto/build b/live-build/auto/build index aa30f55a..19175cd8 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -254,10 +254,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 [ -f config/universe-enabled ]; then # This is cargo-culted almost verbatim (with some syntax changes for @@ -437,6 +433,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