mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-26 02:11:15 +00:00
Run clean_debian_chroot after minimize_manual
This avoids us having apt cache files in the final image. For auto/build, we move the call to clean_debian_chroot to the end, this also takes care of the caches generated by apt-get update in case of a preinstalled-pool. For layered, it's just a simple swap of the lines. LP: #1826377
This commit is contained in:
parent
d5c0bd170b
commit
e95ad81c47
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
livecd-rootfs (2.579) UNRELEASED; urgency=medium
|
||||
|
||||
* Run clean_debian_chroot after minimize_manual (LP: #1826377)
|
||||
|
||||
-- Julian Andres Klode <juliank@ubuntu.com> Thu, 25 Apr 2019 11:43:11 +0200
|
||||
|
||||
livecd-rootfs (2.578) disco; urgency=medium
|
||||
|
||||
* Fix the sed script that Tobias had right in the first place and I
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user