From 353b9ba8f3fa99f2b49ab62e1c0eb8ca7bb29812 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 6 May 2019 10:26:06 +0000 Subject: [PATCH] Imported 2.578.1 No reason for CPC update specified. --- debian/changelog | 6 ++++++ live-build/auto/build | 4 ++-- live-build/lb_chroot_layered | 2 +- wget-log | 0 wget-log.1 | 0 5 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 wget-log delete mode 100644 wget-log.1 diff --git a/debian/changelog b/debian/changelog index 16ba25d8..1f33af94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.578.1) disco; urgency=medium + + * Run clean_debian_chroot after minimize_manual (LP: #1826377) + + -- Julian Andres Klode Fri, 26 Apr 2019 10:34:05 +0200 + livecd-rootfs (2.578) disco; urgency=medium * Fix the sed script that Tobias had right in the first place and I diff --git a/live-build/auto/build b/live-build/auto/build index 22981da5..8238b8bb 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -308,8 +308,6 @@ EOF apt-get -y --purge autoremove" fi - clean_debian_chroot - if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then # Save even more size by removing apt lists (that are currently removed # downstream anyway) @@ -427,6 +425,8 @@ EOF echo END docdirs /usr/share/livecd-rootfs/minimize-manual chroot + + clean_debian_chroot fi if [ -n "${PASSES}" ]; then diff --git a/live-build/lb_chroot_layered b/live-build/lb_chroot_layered index 113c7e30..61ce9438 100755 --- a/live-build/lb_chroot_layered +++ b/live-build/lb_chroot_layered @@ -244,8 +244,8 @@ create_chroot_pass () { lb chroot_interactive ${*} # Misc ubuntu cleanup and post-layer configuration - clean_debian_chroot /usr/share/livecd-rootfs/minimize-manual chroot + clean_debian_chroot Chroot chroot "dpkg-query -W" > chroot.packages.${pass} diff --git a/wget-log b/wget-log deleted file mode 100644 index e69de29b..00000000 diff --git a/wget-log.1 b/wget-log.1 deleted file mode 100644 index e69de29b..00000000