mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-13 14:27:09 +00:00
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:
parent
e7935db365
commit
bab506b825
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user