Merge lp:~rbalint/livecd-rootfs/minimize-1g-revert

This commit is contained in:
Steve Langasek 2018-01-04 15:07:51 -08:00
commit cb635a6035
2 changed files with 7 additions and 5 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.489) UNRELEASED; urgency=medium
* Revert to building minimized and not minimimized images with the same
~2.2 GiB size
-- Balint Reczey <rbalint@ubuntu.com> Thu, 04 Jan 2018 14:37:51 +0100
livecd-rootfs (2.488) bionic; urgency=medium
* Enable systemd-networkd by default for live-server installs.

View File

@ -717,11 +717,6 @@ echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/chroot
echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
echo "BUILDSTAMP=\"$NOW\"" >> config/binary
echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
if [ "${SUBPROJECT:-}" = minimized ]; then
# try building minimized images in a 1GiB image but still allow overriding
# IMAGE_SIZE in lb build
echo 'IMAGE_SIZE=${IMAGE_SIZE:-'$((1024*1024*1024))'}' >> config/binary
fi
case $ARCH+$SUBARCH in
armhf+raspi2)