diff --git a/debian/changelog b/debian/changelog index 75439c9c..bc01862e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 13 Dec 2019 18:12:12 +0100 + livecd-rootfs (2.634) focal; urgency=medium * Only build bootable buildd images for amd64. diff --git a/live-build/auto/config b/live-build/auto/config index 6ed05a42..ae931e92 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -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