|
|
@ -74,9 +74,8 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
|
|
|
|
# Use ubuntu-image instead of live-build
|
|
|
|
# Use ubuntu-image instead of live-build
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$PROJECT" = "ubuntu-core" ]; then
|
|
|
|
if [ "$PROJECT" = "ubuntu-core" ]; then
|
|
|
|
CHANNEL="${CHANNEL:-edge}"
|
|
|
|
|
|
|
|
env SNAPPY_STORE_NO_CDN=1 \
|
|
|
|
env SNAPPY_STORE_NO_CDN=1 \
|
|
|
|
ubuntu-image snap -c "$CHANNEL" $UBUNTU_IMAGE_ARGS \
|
|
|
|
ubuntu-image snap $UBUNTU_IMAGE_ARGS \
|
|
|
|
-O output "$PREFIX".model-assertion
|
|
|
|
-O output "$PREFIX".model-assertion
|
|
|
|
# XXX: currently we only have one image generated, but really
|
|
|
|
# XXX: currently we only have one image generated, but really
|
|
|
|
# we should be supporting more than one for models that
|
|
|
|
# we should be supporting more than one for models that
|
|
|
|