|
|
|
@ -97,7 +97,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
|
|
|
|
# We could already do that, but then we'd still have to do the
|
|
|
|
# We could already do that, but then we'd still have to do the
|
|
|
|
# compressing for the core images.
|
|
|
|
# compressing for the core images.
|
|
|
|
if [ "$PROJECT" = "ubuntu-core" ]; then
|
|
|
|
if [ "$PROJECT" = "ubuntu-core" ]; then
|
|
|
|
ubuntu-image snap $UBUNTU_IMAGE_ARGS \
|
|
|
|
/snap/bin/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
|
|
|
|
@ -106,7 +106,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
|
|
|
|
xz -0 -T4 "$PREFIX".img
|
|
|
|
xz -0 -T4 "$PREFIX".img
|
|
|
|
mv output/seed.manifest "$PREFIX".manifest
|
|
|
|
mv output/seed.manifest "$PREFIX".manifest
|
|
|
|
else
|
|
|
|
else
|
|
|
|
ubuntu-image classic --verbose $UBUNTU_IMAGE_ARGS \
|
|
|
|
/snap/bin/ubuntu-image classic --verbose $UBUNTU_IMAGE_ARGS \
|
|
|
|
-O output "$PREFIX".yaml
|
|
|
|
-O output "$PREFIX".yaml
|
|
|
|
# Since the output of the ubuntu-image call can vary based on what
|
|
|
|
# Since the output of the ubuntu-image call can vary based on what
|
|
|
|
# kind of an image we build, the safest bet is to 'export' all the
|
|
|
|
# kind of an image we build, the safest bet is to 'export' all the
|
|
|
|
|
Łukasz 'sil2100' Zemczak
2 years ago