Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-17 13:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support generating a .disk/info file via ubuntu-image.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2020-01-22 09:20:21 +01:00
parent b47acc9456
commit 89bcec68c5
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.525.38) UNRELEASED; urgency=medium
* Support generating a .disk/info file via ubuntu-image from the passed-in
datestamp parameter (using the $NOW environment variable). (LP: #1856684)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 22 Jan 2020 09:18:06 +0100
livecd-rootfs (2.525.37) bionic; urgency=medium livecd-rootfs (2.525.37) bionic; urgency=medium
* Use the raspi2-hwe-18.04-edge kernel flavour for the raspi3 images. This * Use the raspi2-hwe-18.04-edge kernel flavour for the raspi3 images. This

9
live-build/auto/config
View File

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