mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-10 20:57:29 +00:00
Imported 2.650
No reason for CPC update specified.
This commit is contained in:
parent
3351678f2e
commit
27765b99d9
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
||||
livecd-rootfs (2.650) focal; urgency=medium
|
||||
|
||||
* Support generating a .disk/info file via ubuntu-image from the passed-in
|
||||
datestamp parameter (using the $NOW environment variable).
|
||||
|
||||
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 06 Mar 2020 11:12:12 +0100
|
||||
|
||||
livecd-rootfs (2.649) focal; urgency=medium
|
||||
|
||||
* Fix autoinstall-extracting runcmd in the case no user-data is passed.
|
||||
|
@ -346,6 +346,13 @@ case $IMAGEFORMAT in
|
||||
;;
|
||||
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
|
||||
# snap-based core images
|
||||
|
||||
@ -353,7 +360,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
|
||||
|
Loading…
x
Reference in New Issue
Block a user