Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 13:21:33 +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 17:01:40 +01:00
parent 492200ba16
commit 03e8249758
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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 <lukasz.zemczak@ubuntu.com> Tue, 21 Nov 2017 17:01:14 +0100
livecd-rootfs (2.408.23) xenial; urgency=medium livecd-rootfs (2.408.23) xenial; urgency=medium
[ Gary Wang ] [ Gary Wang ]

12
live-build/auto/config
View File

@ -107,11 +107,13 @@ add_binary_hook ()
BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1" BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
} }
case $PROJECT in if [ -z "${IMAGEFORMAT:-}" ]; then
ubuntu-cpc) case $PROJECT in
IMAGEFORMAT=ext4 ubuntu-cpc)
;; IMAGEFORMAT=ext4
esac ;;
esac
fi
case $IMAGEFORMAT in case $IMAGEFORMAT in
ext2|ext3|ext4) ext2|ext3|ext4)