diff --git a/debian/changelog b/debian/changelog index 827a90e4..d49636a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.408.24) UNRELEASED; urgency=medium + + * For the IMAGEFORMAT=none parts to work for ubuntu-image classic builds, we + need to make sure IMAGEFORMAT is preserved and not overwritten if defined. + Backporting from artful. + + -- Ɓukasz 'sil2100' Zemczak Tue, 21 Nov 2017 17:01:14 +0100 + livecd-rootfs (2.408.23) xenial; urgency=medium [ Gary Wang ] diff --git a/live-build/auto/config b/live-build/auto/config index 3eb8dae8..badff46a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -107,11 +107,13 @@ add_binary_hook () BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1" } -case $PROJECT in - ubuntu-cpc) - IMAGEFORMAT=ext4 - ;; -esac +if [ -z "${IMAGEFORMAT:-}" ]; then + case $PROJECT in + ubuntu-cpc) + IMAGEFORMAT=ext4 + ;; + esac +fi case $IMAGEFORMAT in ext2|ext3|ext4)