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

[Balint Reczey]

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

1597. By Balint Reczey on 2018-01-04

Revert to building minimized and not minimimized images with the same ~2.2 GiB size

1598. By Balint Reczey on 2018-01-04

Update changelog

[Steve Langasek (vorlon)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-01-03 20:37:28 +0000
+++ debian/changelog	2018-01-04 13:38:53 +0000
@@ -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 <[e-mail]>  Thu, 04 Jan 2018 14:37:51 +0100
+
 livecd-rootfs (2.488) bionic; urgency=medium
 
   * Enable systemd-networkd by default for live-server installs.
 
=== modified file 'live-build/auto/config'
--- live-build/auto/config	2017-11-23 19:27:16 +0000
+++ live-build/auto/config	2018-01-04 13:38:53 +0000
@@ -717,11 +717,6 @@
 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)