Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 03:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support generating a .disk/info file via ubuntu-image if BUILD_ID is passed from cdimage to the builder.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2019-12-13 18:13:36 +01:00
parent 3fe3b18719
commit fc6d956269
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.635) UNRELEASED; urgency=medium
* Support generating a .disk/info file via ubuntu-image if BUILD_ID is
passed from cdimage to the builder.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 13 Dec 2019 18:12:12 +0100
livecd-rootfs (2.634) focal; urgency=medium
* Only build bootable buildd images for amd64.

9
live-build/auto/config
View File

@ -342,6 +342,13 @@ case $IMAGEFORMAT in
;;
esac
# If we have a build_id coming from cdimage, use that to populate
# .disk/info on the target image
if [ -n "$BUILD_ID" ]; then
echo "$BUILD_ID" > config/disk-info
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --disk-info config/disk-info"
fi
if [ $PROJECT = "ubuntu-core" ]; then
# snap-based core images
@ -349,7 +356,7 @@ case $IMAGEFORMAT in
case $MODEL in
pc-amd64|pc-i386)
[ -z "${SUBARCH:-}" ] \
&& UBUNTU_IMAGE_ARGS="--image-size 3700M"
&& UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
;;
*) ;;
esac