From 9774f43c5639de20d23cf4fd30499bf0113524ae Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 6 May 2019 04:47:04 +0000 Subject: [PATCH] Imported 2.525.21 No reason for CPC update specified. --- 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..bbd5b6e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.525.21) bionic; urgency=medium + + * Remove crufty files after minimize-manual (LP: #1826377) + + -- Julian Andres Klode Fri, 26 Apr 2019 10:40:08 +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