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 trunk.

This commit is contained in:
Łukasz 'sil2100' Zemczak 2017-11-21 16:49:10 +01:00
parent e7935db365
commit bab506b825

View File

@ -104,14 +104,16 @@ add_binary_hook ()
BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
}
case $PROJECT:$SUBPROJECT in
ubuntu-cpc:*)
IMAGEFORMAT=ext4
;;
ubuntu-server:live)
IMAGEFORMAT=plain
;;
esac
if [ -z "${IMAGEFORMAT:-}" ]; then
case $PROJECT:$SUBPROJECT in
ubuntu-cpc:*)
IMAGEFORMAT=ext4
;;
ubuntu-server:live)
IMAGEFORMAT=plain
;;
esac
fi
case $IMAGEFORMAT in
ext2|ext3|ext4)