|
|
@ -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
|
|
|
|