Imported 2.751

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,29 @@
+livecd-rootfs (2.751) jammy; urgency=medium
+
+  * Revert patch for unmounting in local builds as it is causing autopkgtest
+    regressions
+
+ -- William 'jawn-smith' Wilson <jawn-smith@ubuntu.com>  Wed, 12 Jan 2022 13:43:24 -0600
+
+livecd-rootfs (2.750) jammy; urgency=medium
+
+  * Do not look for a base snap on snaps of type base, because recursive
+    dependencies are not allowed for snaps.  LP: #1957123.
+  * Treat it as a fatal error if we are asked to install a snap that would
+    pull in the core snap.  Ubuntu 20.04 and Ubuntu 22.04 official images
+    should never require snaps that depend on an Ubuntu 16.04 runtime, this
+    indicates a misconfiguration that will bloat the install.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 11 Jan 2022 17:34:37 -0800
+
+livecd-rootfs (2.749) jammy; urgency=medium
+
+  [ Heinrich Schuchardt ]
+  * riscv64: ensure reasonable partition alignment (LP: #1952916).
+  * functions: fix unmounting for local builds (LP: #1952921).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 16 Dec 2021 12:40:16 +0100
+
 livecd-rootfs (2.748) jammy; urgency=medium
 
   * live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl: do not

live-build/functions

@@ -585,12 +585,20 @@ _snap_preseed() {
                 exit 1
             fi
 
-            local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}')
+            local snap_type=$(echo "$snap_info" | awk '/^type:/ { print $2 }')
 
-            # If snap info does not list a base use 'core'
-            core_snap=${core_snap:-core}
+            if [ "$snap_type" != base ]; then
+                local core_snap=$(echo "$snap_info" | awk '/^base:/ {print $2}')
 
-            _snap_preseed $CHROOT_ROOT $core_snap stable
+                # If snap info does not list a base the default is 'core'
+                # which is now an error to use.
+                if [ -z "$core_snap" ]; then
+                    echo "Legacy snap with no base declaration found, refusing to install 'core' snap"
+                    exit 1
+                fi
+
+                _snap_preseed $CHROOT_ROOT $core_snap stable
+            fi
             ;;
     esac
 

live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

@@ -77,7 +77,7 @@ create_partitions() {
                        --new=13:34:2081 \
                        --change-name=13:loader1 \
                        --typecode=13:5B193300-FC78-40CD-8002-E86C45580B47 \
-                       --new=14:2082:10273 \
+                       --new=14:2082:10239 \
                        --change-name=14:loader2 \
                        --typecode=14:2E54B353-1271-4842-806F-E436D6AF6985 \
                        --new=15::+106M \