Some updates to the core-desktop builds.

live-build/auto/build

@@ -123,7 +123,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 			cat install-sources-in.yaml | sed "s/@SIZE@/$(stat -c%s pc.img.xz)/g" > install-sources.yaml
 			# Now move all of the payload to the image-definitions directory,
 			# so that they can be used by the image-definition effectively.
-			mv install-sources.yaml pc.img.xz autoinstall.yaml 99-custom-networking.cfg ../image-definitions/
+			mv install-sources.yaml pc.img.xz autoinstall.yaml 99-custom-networking.cfg casper* ../image-definitions/
 			cd ../
 
 			# Also, since we care about the model assertion to be presented,

live-build/auto/config

@@ -518,7 +518,7 @@ case $IMAGEFORMAT in
 					# one for the payload and one for the actual image
 					echo "Configuring for additional payload preparation"
 					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 evince firefox gnome-calculator gnome-characters gnome-clocks gnome-font-viewer gnome-logs gnome-system-monitor gnome-text-editor gnome-weather loupe snapd-desktop-integration snap-store ubuntu-core-desktop-init workshops"
 					for snap in $EXTRA_SNAPS; do
 						UBUNTU_IMAGE_PAYLOAD_ARGS="$UBUNTU_IMAGE_PAYLOAD_ARGS --snap $snap"
 					done

live-build/ubuntu-core-desktop/casper-enable

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/systemctl enable casper

live-build/ubuntu-core-desktop/casper-stop

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# Author: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+#         Tollef Fog Heen <tfheen@canonical.com>
+#         Marco Amadori <marco.amadori@gmail.com>
+#
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
+do_stop ()
+{
+    prompt=1
+    if grep -qs noprompt /proc/cmdline || [ -e /run/casper-no-prompt ]; then
+        prompt=
+    fi
+
+    # XXX - i18n
+    MSG="Please press ENTER then remove the installation medium: "
+    MSG_FALLBACK="Please remove the installation medium, then reboot."
+
+    if [ "$prompt" ]; then
+        if [ -x /bin/plymouth ] && plymouth --ping; then
+            chvt 63
+            plymouth message --text="$MSG"
+            clear > /dev/tty1
+            echo $MSG_FALLBACK > /dev/tty1
+        else
+            stty sane < /dev/console
+            echo $MSG > /dev/console
+        fi
+    fi
+
+    [ "$prompt" ] || return 0
+
+    if [ -x /bin/plymouth ] && plymouth --ping; then
+        plymouth watch-keystroke > /dev/null
+    else
+        read x < /dev/console
+    fi
+}
+
+do_stop
+

live-build/ubuntu-core-desktop/casper.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=Shuts down the "live" preinstalled system cleanly
+DefaultDependencies=no
+Before=final.target
+After=shutdown.target umount.target plymouth-halt.service plymouth-poweroff.service plymouth-reboot.service
+
+[Service]
+Type=oneshot
+ExecStart=/sbin/casper-stop
+StandardInput=tty-force
+StandardOutput=inherit
+StandardError=inherit
+TTYReset=yes
+
+[Install]
+WantedBy=final.target