|
|
|
@ -464,6 +464,9 @@ case $IMAGEFORMAT in
|
|
|
|
|
echo "$NOW" > config/disk-info
|
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --disk-info config/disk-info"
|
|
|
|
|
fi
|
|
|
|
|
if [ -n "$SECTOR_SIZE" ]; then
|
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --sector-size=$SECTOR_SIZE"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ $PROJECT = "ubuntu-core" ]; then
|
|
|
|
|
# snap-based core images
|
|
|
|
@ -521,7 +524,6 @@ case $IMAGEFORMAT in
|
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --snap=$snap"
|
|
|
|
|
done
|
|
|
|
|
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
|
|
|
|
|
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
|
|
|
|
|
# Store model assertion in top dir to get it picked up later as a build artifact
|
|
|
|
|
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
|
|
|
|
|
echo "Configured ubuntu-image for the following model assertion:"
|
|
|
|
@ -551,6 +553,7 @@ case $IMAGEFORMAT in
|
|
|
|
|
# Save the model name used for building, mostly for any model-specific hook execution
|
|
|
|
|
echo "MODEL=$MODEL" >> config/common
|
|
|
|
|
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
|
|
|
|
|
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
|
|
|
|
|
# Fake finished configuration for lb build
|
|
|
|
|
mkdir -p .build
|
|
|
|
|
touch .build/config
|
|
|
|
|