Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 09:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2017-11-21 16:49:10 +01:00
parent e7935db365
commit bab506b825
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
live-build/auto/config
View File

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