Imported 23.10.22 from mantic-release pocket.

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (23.10.22) mantic; urgency=medium
+
+  * Undo preseeding in reset_snapd_state.
+  * update-source-catalog: work better when we want a variation to point
+    at the base layer.
+  * Stop launching a gnome-terminal at startup of the canary live session.
+    (LP: #2032647)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Fri, 25 Aug 2023 18:45:03 +1200
+
 livecd-rootfs (23.10.21) mantic; urgency=medium
 
   * Deduplicate the layers just before creating the squashfs, to enable

live-build/functions

@@ -1236,6 +1236,7 @@ EOF
 reset_snapd_state() {
     rootdir="$1"
 
+    /usr/lib/snapd/snap-preseed --reset $(realpath "$rootdir") || true
     rm -rf "$rootdir/var/lib/snapd"
     setup_mountpoint "$rootdir"
     chroot "$rootdir" apt-get install --reinstall -y snapd

live-build/ubuntu/hooks/020-canary-live.binary

@@ -145,24 +145,6 @@ mode=run
 recovery_system=classic-installer
 EOF
 
-# Temporary while we still use the subiquity TUI for the live system
-cat > chroot/usr/lib/systemd/user/subiquity-tui.service  << EOF
-[Unit]
-Description=subiquity tui
-PartOf=graphical-session.target
-After=graphical-session.target
-
-# Never run in GDM
-Conflicts=gnome-session@gnome-login.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/gnome-terminal --wait -- sudo sh -c 'echo waiting for snapd; snap wait system seed.loaded; sleep 5; snap run subiquity'
-Restart=no
-EOF
-mkdir chroot/etc/systemd/user/graphical-session.target.wants/
-ln -vs /usr/lib/systemd/user/subiquity-tui.service chroot/etc/systemd/user/graphical-session.target.wants/
-
 mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic
 mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic
 chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic

update-source-catalog

@@ -37,12 +37,18 @@ for entry in output:
         if 'variations' not in template:
             print("Non unique id in source catalog but no variations!")
             sys.exit(1)
-        for k, variation in template['variations'].items():
+        for variation in template['variations'].values():
             variation['size'] = int(opts.size)
         entry.setdefault('variations', {}).update(template['variations'])
         break
 else:
     # No entry with this id found, so add a new one.
+
+    if template['variations']:
+        for variation in template['variations'].values():
+            if variation['path'] == opts.squashfs:
+                variation['size'] = int(opts.size)
+
     template['size'] = int(opts.size)
     template['path'] = opts.squashfs