More verbosity, change the filename of the payload assertion.

ubuntu-core-desktop
Łukasz 'sil2100' Zemczak 1 year ago
parent 4c458db079
commit 75d2250bf9

@ -113,7 +113,6 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# ubuntu-image twice, once for the core image payload and # ubuntu-image twice, once for the core image payload and
# then for the actual image. # then for the actual image.
echo "Building the core image payload" echo "Building the core image payload"
cd config/ cd config/
/snap/bin/ubuntu-image snap $UBUNTU_IMAGE_PAYLOAD_ARGS \ /snap/bin/ubuntu-image snap $UBUNTU_IMAGE_PAYLOAD_ARGS \
-O output ubuntu-core-desktop*.model-assertion -O output ubuntu-core-desktop*.model-assertion

@ -516,6 +516,7 @@ case $IMAGEFORMAT in
ubuntu-core-desktop) ubuntu-core-desktop)
# The ubuntu-core-desktop case is special as we need 2 ubuntu-image calls: # The ubuntu-core-desktop case is special as we need 2 ubuntu-image calls:
# one for the payload and one for the actual image # one for the payload and one for the actual image
echo "Configuring for additional payload preparation"
UBUNTU_IMAGE_PAYLOAD_ARGS="--image-size 12G" UBUNTU_IMAGE_PAYLOAD_ARGS="--image-size 12G"
EXTRA_SNAPS="$EXTRA_SNAPS eog evince firefox gnome-calculator gnome-characters gnome-clocks gnome-font-viewer gnome-logs gnome-text-editor gnome-weather ubuntu-core-desktop-init" EXTRA_SNAPS="$EXTRA_SNAPS eog evince firefox gnome-calculator gnome-characters gnome-clocks gnome-font-viewer gnome-logs gnome-text-editor gnome-weather ubuntu-core-desktop-init"
for snap in $EXTRA_SNAPS; do for snap in $EXTRA_SNAPS; do

Loading…
Cancel
Save