Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-11 19:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove device nodes later for ubuntu-base:minimized (i.e. docker) builds. (LP: #1828118)

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2019-05-08 10:49:51 +12:00
parent af525ff0b4
commit a7b8928928
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.542.3) UNRELEASED; urgency=medium
* Remove device nodes later for ubuntu-base:minimized (i.e. docker) builds.
(LP: #1828118)
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 08 May 2019 10:48:39 +1200
livecd-rootfs (2.542.2) cosmic; urgency=medium livecd-rootfs (2.542.2) cosmic; urgency=medium
* Remove crufty files after minimize-manual (LP: #1826377) * Remove crufty files after minimize-manual (LP: #1826377)

22
live-build/auto/build
View File

@ -259,17 +259,6 @@ EOF
apt-get -y --purge autoremove" apt-get -y --purge autoremove"
fi fi
if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then
# Save even more size by removing apt lists (that are currently removed
# downstream anyway)
rm -rf chroot/var/lib/apt/lists/*
# Having device notes in the docker image can cause problems
# (https://github.com/tianon/docker-brew-ubuntu-core/issues/62)
# so remove them. We only do this for docker out of an
# abundance of caution.
rm -rf chroot/dev/*
fi
if [ -f config/universe-enabled ]; then if [ -f config/universe-enabled ]; then
# This is cargo-culted almost verbatim (with some syntax changes for # This is cargo-culted almost verbatim (with some syntax changes for
@ -452,6 +441,17 @@ EOF
# remove crufty files that shouldn't be left in an image # remove crufty files that shouldn't be left in an image
rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
Chroot chroot apt clean Chroot chroot apt clean
# For the docker images we remove even more stuff.
if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then
# Remove apt lists (that are currently removed downstream
# anyway)
rm -rf chroot/var/lib/apt/lists/*
# Having device nodes in the docker image can cause problems
# (https://github.com/tianon/docker-brew-ubuntu-core/issues/62)
# so remove them. We only do this for docker out of an
# abundance of caution.
rm -rf chroot/dev/*
fi
lb binary "$@" lb binary "$@"
touch binary.success touch binary.success