Compare commits

...

3 Commits

Author SHA1 Message Date
Michael Hudson-Doyle
51bd9d5b4a releasing package livecd-rootfs version 2.578.2 2019-05-08 10:44:02 +12:00
Michael Hudson-Doyle
523a964b64 Remove device nodes later for ubuntu-base:minimized (i.e. docker) builds. (LP: #1828118) 2019-05-08 10:43:49 +12:00
Julian Andres Klode
a3dac25d86 releasing package livecd-rootfs version 2.578.1 2019-04-26 10:34:17 +02:00
3 changed files with 21 additions and 14 deletions

11
debian/changelog vendored
View File

@ -1,8 +1,15 @@
livecd-rootfs (2.579) UNRELEASED; urgency=medium livecd-rootfs (2.578.2) disco; 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 09:59:35 +1200
livecd-rootfs (2.578.1) disco; urgency=medium
* Run clean_debian_chroot after minimize_manual (LP: #1826377) * Run clean_debian_chroot after minimize_manual (LP: #1826377)
-- Julian Andres Klode <juliank@ubuntu.com> Thu, 25 Apr 2019 11:43:11 +0200 -- Julian Andres Klode <juliank@ubuntu.com> Fri, 26 Apr 2019 10:34:05 +0200
livecd-rootfs (2.578) disco; urgency=medium livecd-rootfs (2.578) disco; urgency=medium

View File

@ -308,17 +308,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
configure_universe configure_universe
if [ -d chroot/var/lib/preinstalled-pool ]; then if [ -d chroot/var/lib/preinstalled-pool ]; then

View File

@ -717,7 +717,18 @@ subtract_package_lists() {
clean_debian_chroot() { clean_debian_chroot() {
# 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
} }
configure_universe() { configure_universe() {