Update d/ch for 25.10.17 release

This is follow up work to LP: #2120473 being resolved.

debian/.gitignore

@@ -0,0 +1 @@
+files

debian/changelog

@@ -1,87 +1,319 @@
-livecd-rootfs (24.04.94) noble; urgency=medium
+livecd-rootfs (25.10.17) questing; urgency=medium
 
-  [ Chad Smith ]
+  [ Tim Andersson ]
-  * Override cloud-init.service in /etc so as to not invalidate debsums
+  * Enable ubuntu-dangerous desktop builds (desktop images
-    (LP: #2069391)
+    with all snaps on edge).
-  * Update the overridden copy of cloud-init.service
+  * Remove temporary snap overrides.
-  * These changes were introduced in 24.04.90 first, then reverted.
+  * Import latest 25.10 classic model (LP: #2120473)
+  * Import 25.10 dangerous model with all snap channels corrected.
 
- -- Antoine Lassagne <antoine.lassagne@canonical.com>  Thu, 21 Aug 2025 14:17:08 +0200
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Wed, 27 Aug 2025 18:57:13 +0530
 
-livecd-rootfs (24.04.93) noble; urgency=medium
+livecd-rootfs (25.10.16) questing; urgency=medium
 
-  * Add 6.14 kernel apparmor features' preseeds. (LP: #2116199)
+  * Put the uc20-style system seed for TPM backed FDE in the live layer.
 
- -- Bryan Alexander <bryan.alexander@canonical.com>  Thu, 17 Jul 2025 11:52:40 -0700
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 13 Aug 2025 10:34:39 +1200
 
-livecd-rootfs (24.04.92) noble; urgency=medium
+livecd-rootfs (25.10.15) questing; urgency=medium
 
-  * Temporarily revert the 24.04.90 changes.  We wish to validate only
+  * Add missing components to 6.14 kernel apparmor features' preseeds.
-    24.04.91 for Ubuntu 24.04.3 point release.
+    (LP: #2116199)
 
- -- Dan Bungert <daniel.bungert@canonical.com>  Thu, 31 Jul 2025 11:27:41 -0600
+ -- Bryan Alexander <bryan.alexander@canonical.com>  Thu, 17 Jul 2025 13:27:17 -0700
 
-livecd-rootfs (24.04.91) noble; urgency=medium
+livecd-rootfs (25.10.14) questing; urgency=medium
 
-  * Fix lowlatency kernel flavour name (LP: #2119012)
+  [ Didier Roche-Tolomelli ]
+  [ Tim Andersson ]
+  [ Daniel Bungert ]
+  * desktop TPMFDE: move snaps back to stable channels
 
- -- Juerg Haefliger <juerg.haefliger@canonical.com>  Wed, 30 Jul 2025 17:36:25 +0200
+ -- Dan Bungert <daniel.bungert@canonical.com>  Thu, 07 Aug 2025 16:21:32 -0600
 
-livecd-rootfs (24.04.90) noble; urgency=medium
+livecd-rootfs (25.10.13) questing; urgency=medium
 
-  [ Chad Smith ]
+  [ Olivier Gayot ]
-  * Override cloud-init.service in /etc so as to not invalidate debsums
+  * Build ubuntu-server with multipath-tools-boot installed, so that the
-    (LP: #2069391)
+    multipath stack ends up present in the initramfs.
-  * Update the overridden copy of cloud-init.service
+    The LVM stack is already present in the initramfs of the installer. And
+    since kinetic, the /dev/mapper entries for LVM devices are created during
+    the initramfs phase. This is a problem when we have LVM on top of a
+    multipath disk because LVM ends up creating /dev/mapper entries out of
+    /dev/sdX (or /dev/sdXpY) devices, not out of /dev/mapper/mpatha as it
+    should. Adding the multipath stack in the initramfs gives multipath a
+    chance to take ownership of /dev/sdX (or /dev/sdXpY) devices before LVM
+    does (LP: #2080474).
 
- -- Dan Bungert <daniel.bungert@canonical.com>  Tue, 22 Jul 2025 15:50:34 -0600
+ -- Dan Bungert <daniel.bungert@canonical.com>  Thu, 24 Jul 2025 17:37:33 -0600
 
-livecd-rootfs (24.04.89) noble; urgency=medium
+livecd-rootfs (25.10.12) questing; urgency=medium
 
-  * desktop: Remove some cruft referencing the subiquity snap, which can
+  [ Zygmunt Krynicki ]
-    result in 'error: snap "subiquity" is not installed' messages being
+  * Use snap wait system seed.loaded to wait for snapd (LP: #2114923)
-    printed on the terminal.  (LP: #2083554)
 
- -- Dan Bungert <daniel.bungert@canonical.com>  Wed, 30 Apr 2025 15:27:46 -0600
+  [ Dennis Loose ]
+  [ Didier Roche-Tolomelli ]
+  * Allow the ubuntu-desktop-installer to request snap seeding state
 
-livecd-rootfs (24.04.88) noble; urgency=medium
+ -- Didier Roche-Tolomelli <didrocks@ubuntu.com>  Tue, 15 Jul 2025 16:30:41 +0200
 
-  * risc-v: directly copy device trees to /boot/dtb. (LP: #2092205)
+livecd-rootfs (25.10.11) questing; urgency=medium
+
+  * Fix installer startup to wait for snapd to be preseeded first
+    (LP: #2114923)
+
+ -- Didier Roche-Tolomelli <didrocks@ubuntu.com>  Fri, 11 Jul 2025 14:57:56 +0200
+
+livecd-rootfs (25.10.10) questing; urgency=medium
+
+  * risc-v cloud images: enable cpc fixes for riscv64
+
+ -- Adriano Cordova <adriano.cordova@canonical.com>  Tue, 01 Jul 2025 09:11:16 -0400
+
+livecd-rootfs (25.10.9) questing; urgency=medium
+
+  * desktop and server: read $SUBARCH to allow the use of nvidia's kernel
+    instead of generic (LP: #2109822)
+
+ -- Antoine Lassagne <antoine.lassagne@canonical.com>  Tue, 17 Jun 2025 22:23:11 +1200
+
+livecd-rootfs (25.10.8) questing; urgency=medium
+
+  [ Didier Roche-Tolomelli ]
+  * desktop: use snapd from edge
+  * desktop: tpmfde image use desktop-security-center and firmware-updater
+    from edge
+
+  [ Dan Bungert ]
+  * lb_binary_layered: try #2 to fix mtimes in layered squashfses. (LP2107332)
+    Constrain mtime sync to the current upperdir so that files in lower layers
+    are not redundantly included.
+  * server: fix failure to process the hwe kernel layer due to multiple
+    kernels being present (LP: #2112501)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Fri, 13 Jun 2025 12:00:20 -0600
+
+livecd-rootfs (25.10.7) questing; urgency=medium
+
+  * revert 25.10.6 due to duplicated snaps
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Tue, 10 Jun 2025 07:55:40 -0600
+
+livecd-rootfs (25.10.6) questing; urgency=medium
+
+  * lb_binary_layered: fix mtimes in layered squashfses. (LP: #2107332)
+    Failing to preserve mtime causes unnecessary python pyc rebuilds due to
+    mtime mismatch, and it's generally strange that reinstalling a package
+    that is already installed changes the files on the system (minus
+    intentional differences such as what's going on in the minimized install
+    source).
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Fri, 30 May 2025 17:05:15 -0600
+
+livecd-rootfs (25.10.5) questing; urgency=medium
+
+  * desktop: TPMFDE snapd from latest/edge
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Wed, 28 May 2025 10:27:47 -0600
+
+livecd-rootfs (25.10.4) questing; urgency=medium
+
+  * desktop: TPMFDE kernel from 25.10/candidate
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Sun, 25 May 2025 23:18:59 -0600
+
+livecd-rootfs (25.10.3) questing; urgency=medium
+
+  * desktop: update TPMFDE model and don't skip 020-ubuntu-enhanced-sb.binary.
+    (LP: #2110195)  Temporarily use the model that allows overriding snap
+    channels so we can get matching snaps.
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Fri, 23 May 2025 12:59:40 -0600
+
+livecd-rootfs (25.10.2) questing; urgency=medium
+
+  * desktop: skip 020-ubuntu-enhanced-sb.binary until a matching kernel is
+    ready for snapd 2.68.x
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Tue, 06 May 2025 08:24:10 +0200
+
+livecd-rootfs (25.10.1) questing; urgency=medium
+
+  * desktop: no longer involve cloud-init in early networking (LP: #2107225)
+  * server: provide network config direct to netplan
+  * server: update default netplan config for IPv6 autoconfiguration &
+    connectivity
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Mon, 28 Apr 2025 09:53:34 -0600
+
+livecd-rootfs (25.04.26) plucky; urgency=medium
+
+  * cpc: Restore UseDomains=true in cloud images (LP: #2106729)
+
+ -- Tomáš Virtus <tomas.virtus@canonical.com>  Thu, 10 Apr 2025 13:07:25 +0000
+
+livecd-rootfs (25.04.25) plucky; urgency=medium
+
+  * live-build/auto/build: Use --workdir in ubuntu-image to avoid filling
+    tmpfs-based /tmp (LP: #2103735)
+
+ -- Dave Jones <dave.jones@canonical.com>  Thu, 20 Mar 2025 17:22:47 +0000
+
+livecd-rootfs (25.04.24) plucky; urgency=medium
+
+  * desktop: update TPMFDE model to move pc-kernel to channel 25.04/stable.
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Thu, 13 Mar 2025 17:17:30 -0600
+
+livecd-rootfs (25.04.23) plucky; urgency=medium
+
+  * Add 6.14 kernel apparmor features' preseeds. (LP: #2102120)
+
+ -- Jess Jang <jess.jang@canonical.com>  Wed, 12 Mar 2025 21:08:31 -0500
+
+livecd-rootfs (25.04.22) plucky; urgency=medium
+
+  * server: leave the initrd.img symlink, we want that later for probably
+    several reasons but at least for LP: #2101831
+  * desktop: update TPMFDE model for 25.04.
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Tue, 11 Mar 2025 09:16:03 -0600
+
+livecd-rootfs (25.04.21) plucky; urgency=medium
+
+  * With subiquity builds, setup install-sources to offer bridge kernel.
+  * Add USE_BRIDGE_KERNEL to make it easier to control in the future.
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Wed, 05 Mar 2025 08:18:54 -0700
+
+livecd-rootfs (25.04.20) plucky; urgency=medium
+
+  [ Adriano Cordova ]
   * riscv: add SUBARCH 'jh7110'. (LP: #2099993)
 
- -- Adriano Cordova <adriano.cordova@canonical.com>  Mon, 10 Feb 2025 10:40:23 -0300
+  [ Michael Hudson-Doyle ]
+  * In ubuntu-server builds, install the first kernel in the base layer, not
+    the "ga" kernel (which may not be installed at all, as is the case in e.g.
+    the arm64+largemem builds).
+  * Again in ubuntu-server builds, configure LAYERFS_PATH in the kernel layer
+    and ensure the initrd is freshly regenerated in that layer. LAYERFS_PATH
+    was being set to the layer below the kernel layer, which meant that the
+    live session did not get access to all the modules in the case that the
+    kernel had not been installed in the base layer, which in turn means that
+    installs fail. (LP: #2100148)
+  * While we're at it, delete any initrd from any other layer than a kernel
+    layer, as they just waste space on the ISO.
 
-livecd-rootfs (24.04.87) noble; urgency=medium
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 27 Feb 2025 20:34:01 +1300
 
-  * Add 6.11 kernel apparmor features' preseeds. (LP: #2098306)
+livecd-rootfs (25.04.19) plucky; urgency=medium
 
- -- Thomas Bechtold <thomas.bechtold@canonical.com>  Thu, 13 Feb 2025 12:22:41 +0100
+  * add cpc-sbom to create_manifest calls to generate sboms (LP: #2077105)
 
-livecd-rootfs (24.04.86) noble; urgency=medium
+ -- Thomas Bechtold <thomasbechtold@jpberlin.de>  Tue, 25 Feb 2025 13:20:49 +0100
 
-  * Do not build HWE kernel layer on RISC-V as there is no HWE kernel there.
+livecd-rootfs (25.04.18) plucky; urgency=medium
-    (LP: #2098622)
 
- -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 17 Feb 2025 11:32:19 +1300
+  [ Michael Hudson-Doyle ]
+  * Pre-emptively include the override to not try to build HWE kernel layer in
+    post .2 server riscv64 ISOs.
 
-livecd-rootfs (24.04.85) noble; urgency=medium
+  [ Simon Quigley ]
+  * Move from http://ppa.launchpad.net to https://ppa.launchpadcontent.net
+    when specifying EXTRA_PPAS.
+  * Update debhelper compat to 13, no changes needed.
+  * Make the package completely Lintian-clean except for no-dep5-copyright.
+  * Update Standards-Version to 4.7.0, no changes needed.
+  * Add support for multiple pools (/var/lib/{livefs,preinstalled}-pool/).
 
+  [ Simon Poirier ]
+  * increase ubuntu-cpc ppc64el disk size to 2.4G
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 20 Feb 2025 10:24:04 +1300
+
+livecd-rootfs (25.04.17) plucky; urgency=medium
+
+  [ Dan Bungert ]
   * Fix build failure when using lowlatency-hwe-24.04, as ubuntustudio does.
     (LP: #2098105)
 
- -- Dan Bungert <daniel.bungert@canonical.com>  Wed, 12 Feb 2025 18:39:48 -0700
+  [ Michael Hudson-Doyle ]
+  * live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary: Drop the
+    assumption that the uncompressed part of the initrd is unpacked to a
+    directory called "main".
+  * live-build/ubuntu-mini-iso/hooks/01-mini-iso.chroot_early: Fix paths that
+    should have been adjusted when code moved from binary to chroot hook.
 
-livecd-rootfs (24.04.84) noble; urgency=medium
+ -- Dan Bungert <daniel.bungert@canonical.com>  Fri, 14 Feb 2025 17:25:29 +1300
 
-  [ Florent 'Skia' Jacquet ]
+livecd-rootfs (25.04.16) plucky; urgency=medium
-  * Enable the HWE stack for 24.04.2. (LP: #2098105)
 
-  [ Utkarsh Gupta ]
+  * buildd: add udev to buildd images to fix networking issue. (LP: #2092196)
-  * Bump HWE kernel track to 24.04 for ubuntu-core-desktop.
 
- -- Utkarsh Gupta <utkarsh@ubuntu.com>  Thu, 13 Feb 2025 03:15:12 +0530
+ -- Simon Poirier <simon.poirier@canonical.com>  Thu, 13 Feb 2025 13:44:02 -0500
 
-livecd-rootfs (24.04.83) noble; urgency=medium
+livecd-rootfs (25.04.15) plucky; urgency=medium
+
+  * Add 6.12 kernel apparmor features' preseeds.
+
+ -- Thomas Bechtold <thomas.bechtold@canonical.com>  Thu, 13 Feb 2025 12:14:33 +0100
+
+livecd-rootfs (25.04.14) plucky; urgency=medium
+
+  * Restore the default-layer.conf file in the initrd (LP: #2097838)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Tue, 11 Feb 2025 08:21:56 -0700
+
+livecd-rootfs (25.04.13) plucky; urgency=medium
+
+  * install-sources: quote default kernel argument.
+  * ubuntu-core-installer: update install-sources.yaml with kernel.
+
+ -- Chris Peterson <chris.peterson@canonical.com>  Wed, 05 Feb 2025 17:43:34 -0800
+
+livecd-rootfs (25.04.12) plucky; urgency=medium
+
+  * Stop producing a rootfs tarball for the ubuntu-mini-iso builds.
+  * Move configuration of casper in ubuntu-serve:live builds to a "chroot
+    early" hook for the installer layer and remove the now unnecessary
+    update-initramfs from the binary hook that breaks because mkinitramfs
+    now requires that /sys is mounted. (LP: #2097280)
+  * Similar changes for ubuntu-mini-iso build.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 05 Feb 2025 15:26:13 +1300
+
+livecd-rootfs (25.04.11) plucky; urgency=medium
+
+  [ Heinrich Schuchardt ]
+  * riscv: copy device trees dtb/ in ESP
+
+  [ Michael Hudson-Doyle ]
+  * Allow snapd to re-exec in installer environment (the issues between snapd,
+    overlayfs and apparmer that meant re-execing caused problems were fixed in
+    snapd a long time ago).
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 29 Jan 2025 08:51:49 +1300
+
+livecd-rootfs (25.04.10) plucky; urgency=medium
+
+  * riscv: copy device trees to the ESP. Fixes (LP: #2095415)
+
+ -- Adriano Cordova <adriano.cordova@canonical.com>  Tue, 21 Jan 2025 10:38:54 -0300
+
+livecd-rootfs (25.04.9) plucky; urgency=medium
+
+  * Move reference wsl-setup script to /usr/lib/wsl/
+
+ -- Didier Roche-Tolomelli <didrocks@ubuntu.com>  Wed, 22 Jan 2025 10:17:56 +0100
+
+livecd-rootfs (25.04.8) plucky; urgency=medium
+
+  * risc-v: directly copy device trees to /boot/dtbs (LP: #2092205)
+
+ -- Adriano Cordova <adriano.cordova@canonical.com>  Thu, 19 Dec 2024 10:42:57 -0300
+
+livecd-rootfs (25.04.7) plucky; urgency=medium
 
   [ Carlos Nihelton ]
   [ Didier Roche-Tolomelli ]
@@ -90,105 +322,263 @@ livecd-rootfs (24.04.83) noble; urgency=medium
     - Create livecd-roots tarball as a .wsl extension
     - Create wsl-distribution.conf for WSL images
 
- -- Didier Roche-Tolomelli <didrocks@ubuntu.com>  Thu, 23 Jan 2025 14:22:54 +0100
+ -- Didier Roche-Tolomelli <didrocks@ubuntu.com>  Mon, 09 Dec 2024 14:29:37 +0100
 
-livecd-rootfs (24.04.82) noble; urgency=medium
+livecd-rootfs (25.04.6) plucky; urgency=medium
 
-  * Add support for arm64+tegra-jetson flavor. (LP: #2091392)
+  * Refer to LB_DISTRIBUTION, not SUITE, in the ubuntu-mini-iso binary hook.
 
- -- Remy Martin <remy.martin@canonical.com>  Fri, 13 Dec 2024 11:53:08 +0100
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Fri, 06 Dec 2024 18:59:35 +1300
 
-livecd-rootfs (24.04.81) noble; urgency=medium
+livecd-rootfs (25.04.5) plucky; urgency=medium
 
-  * Introduce unminimize as a package in OCI images. (LP: #2078583)
+  * Fix ubuntu-mini-iso build, by using script from debian-cd to create a
+    bootable ISO rather than the now deleted cd-boot-images-amd64 package.
 
- -- Utkarsh Gupta <utkarsh@ubuntu.com>  Wed, 20 Nov 2024 15:43:55 +0530
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 04 Dec 2024 13:33:53 +1300
 
-livecd-rootfs (24.04.80) noble; urgency=medium
+livecd-rootfs (25.04.4) plucky; urgency=medium
+
+  [ Rémy Martin ]
+  * Add support for arm64+tegra-jetson flavor to disambiguate from the
+    NVIDIA IGX builds.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Tue, 26 Nov 2024 13:41:05 +0000
+
+livecd-rootfs (25.04.3) plucky; urgency=medium
+
+  * Switch Lubuntu to stacked squashfses, and split apart the common
+    functionality to avoid Subiquity-specific commands.
+  * Add optional Dracut support for installed images, enable it for Lubuntu.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 23 Nov 2024 13:52:09 -0600
+
+livecd-rootfs (25.04.2) plucky; urgency=medium
 
   * Explicitly create home directory for buildd system user to avoid issues
-    with installing and running snaps. (LP: #2083240) 
+    with installing and running snaps. (LP: #2083240)
 
- -- jchittum <john.chittum@canonical.com>  Wed, 06 Nov 2024 07:43:40 -0500
+ -- jchittum <john.chittum@canonical.com>  Wed, 06 Nov 2024 07:40:42 -0500
 
-livecd-rootfs (24.04.79) noble; urgency=medium
+livecd-rootfs (25.04.1) plucky; urgency=medium
 
-  * Add apparmor policy permstable32 missing component (LP: #2084698)
+  * Add support for install-sources version: 2, which handles bridge kernels.
 
- -- Thomas Bechtold <thomas.bechtold@canonical.com>  Fri, 18 Oct 2024 13:54:51 +0200
+ -- Dan Bungert <daniel.bungert@canonical.com>  Thu, 17 Oct 2024 08:22:38 -0600
 
-livecd-rootfs (24.04.78) noble; urgency=medium
+livecd-rootfs (24.10.27) oracular; urgency=medium
 
-  * add cpc-sbom to create_manifest calls to generate sboms (LP: #2077105)
+  * Set UBUNTU_STORE_COHORT_KEY="+" to prepare-image to make sure we simply
+    use the latest snap versions regardless of phasing state.
 
- -- jchittum <john.chittum@canonical.com>  Mon, 26 Aug 2024 14:15:05 -0400
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 08 Oct 2024 13:06:10 +0100
 
-livecd-rootfs (24.04.77.1) noble; urgency=medium
+livecd-rootfs (24.10.26) oracular; urgency=medium
+
+  * Use generic kernel flavor for Nezha D1 and LicheeRV Dock.
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Fri, 04 Oct 2024 10:30:28 +0200
+
+livecd-rootfs (24.10.25) oracular; urgency=medium
+
+  * Update the model used for TPM FDE installs, yet again.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Fri, 04 Oct 2024 12:21:38 +1300
+
+livecd-rootfs (24.10.24) oracular; urgency=medium
+
+  * desktop: Remove some cruft referencing the subiquity snap, which can
+    result in 'error: snap "subiquity" is not installed' messages being
+    printed on the terminal.  (LP: #2083554)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Wed, 02 Oct 2024 10:13:41 -0600
+
+livecd-rootfs (24.10.23) oracular; urgency=medium
+
+  * Update the model used for TPM FDE installs, again, hopefully working this
+    time.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 02 Oct 2024 19:06:50 +1300
+
+livecd-rootfs (24.10.22) oracular; urgency=medium
+
+  * Revert "Update the model used for TPM FDE installs."
+    (to unblock apparmor fixes for cloud images)
+
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Mon, 30 Sep 2024 16:19:22 +0530
+
+livecd-rootfs (24.10.21) oracular; urgency=medium
+
+  [ Utkarsh Gupta ]
+  * Add 6.11 kernel apparmor features' preseeds.
+
+  [ Michael Hudson-Doyle ]
+  * Update the model used for TPM FDE installs.
+
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Thu, 19 Sep 2024 19:42:24 +0530
+
+livecd-rootfs (24.10.20) oracular; urgency=medium
+
+  [ Chad Smith ]
+  * Refresh cloud-init service override for updated service file name and
+    ordering fix. (LP: #2081325)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Fri, 20 Sep 2024 12:36:12 -0600
+
+livecd-rootfs (24.10.19) oracular; urgency=medium
+
+  * live-server and desktop: disable kdump-tools only in the live layer.
+
+ -- Chris Peterson <chris.peterson@canonical.com>  Tue, 17 Sep 2024 21:11:15 -0700
+
+livecd-rootfs (24.10.18) oracular; urgency=medium
+
+  * live-server and desktop: disable kdump-tools in the minimal layer
+    to allow the installer to decide when to enable it (LP: #2077990).
+
+ -- Chris Peterson <chris.peterson@canonical.com>  Fri, 13 Sep 2024 09:08:33 -0700
+
+livecd-rootfs (24.10.17) oracular; urgency=medium
+
+  * desktop and subiquity-using flavors: install the kernel in the minimal
+    layer (LP 2080272)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Thu, 12 Sep 2024 15:30:34 -0600
+
+livecd-rootfs (24.10.16) oracular; urgency=medium
+
+  * live-server: fix issue where the kernel was not actually placed in the
+    minimal layer
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Wed, 11 Sep 2024 12:30:35 -0600
+
+livecd-rootfs (24.10.15) oracular; urgency=medium
+
+  * live-server: install the kernel in the minimal layer (LP: #2080272)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Tue, 10 Sep 2024 12:42:33 -0600
+
+livecd-rootfs (24.10.14) oracular; urgency=medium
+
+  [ Sergio Costas ]
+  * Switch ubuntu-core-desktop project to be a subproject of the
+    ubuntu-core-installer project.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 10 Sep 2024 16:11:32 +1200
+
+livecd-rootfs (24.10.13) oracular; urgency=medium
+
+  * Fix autopkgtest issue where /tmp mounted with nodev is used as a working
+    directory, which understandably causes problems for device node creation.
+    (LP: #2078980)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Wed, 04 Sep 2024 14:27:27 -0600
+
+livecd-rootfs (24.10.12) oracular; urgency=medium
 
-  * Hotfix upload outside of git history, real change from 24.04.79.
   * Update ubuntu-classic-2404-amd64 model in ubuntu hooks. (LP: #2077899)
 
- -- Chris Peterson <chris.peterson@canonical.com>  Mon, 26 Aug 2024 16:57:12 -0700
+ -- Chris Peterson <chris.peterson@canonical.com>  Mon, 26 Aug 2024 17:03:28 -0700
 
-livecd-rootfs (24.04.77) noble; urgency=medium
+livecd-rootfs (24.10.11) oracular; urgency=medium
 
-  * Drop unminimize spit out by livecd-rootfs. (LP: #2077695)
+  [ Simon Poirier ]
-  * Use packaged unminimize in the ubuntu-server images.
+  * disk-image-uefi: Fix regression with partition sizing on arm.
 
- -- Utkarsh Gupta <utkarsh@ubuntu.com>  Wed, 21 Aug 2024 12:08:44 +0530
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Thu, 22 Aug 2024 04:58:46 +0530
 
-livecd-rootfs (24.04.76) noble; urgency=medium
+livecd-rootfs (24.10.10) oracular; urgency=medium
 
-  * Force latest/stable/ubuntu-24.10 subiquity onto the ubuntu-core-installer
+  * disk-image-uefi.binary: Shift down boot partition to 13 to support systems
-    ISO for now. (LP: #2077495)
+    which don't handle partition numbers higher than 15. (LP: #2072929)
 
- -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 21 Aug 2024 16:13:58 +1200
+ -- Simon Poirier <simon.poirier@canonical.com>  Tue, 20 Aug 2024 18:57:57 -0400
 
-livecd-rootfs (24.04.75) noble; urgency=medium
+livecd-rootfs (24.10.9) oracular; urgency=medium
 
-  * Add 'ubuntu-core-installer' project. (LP: #2076307)
+  [ Cody Shepherd ]
+  * fix: remove ec2-version hook for cpc images.
 
- -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 30 Jul 2024 16:35:31 +1200
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Wed, 14 Aug 2024 18:02:29 +0530
 
-livecd-rootfs (24.04.74) noble; urgency=medium
+livecd-rootfs (24.10.8) oracular; urgency=medium
+
+  [ Erich Eickmeyer ]
+  * Add minimal installation to Ubuntu Studio
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 25 Jul 2024 11:12:52 -0700
+
+livecd-rootfs (24.10.7) oracular; urgency=medium
 
   * riscv64: preinstalled server image for Microchip PIC64GX Curiosity Kit
     (LP: #2072956)
 
- -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Mon, 08 Jul 2024 17:51:25 +0200
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Mon, 22 Jul 2024 14:51:25 +0200
 
-livecd-rootfs (24.04.73) noble; urgency=medium
+livecd-rootfs (24.10.6) oracular; urgency=medium
 
-  * Build qcow2 images for ubuntu-core LXD support (LP: #2072759).
+  [ Chad Smith ]
+  * Override cloud-init.service in /etc so as to not invalidate debsums
+    (LP: #2069391)
+  * Update the overridden copy of cloud-init.service
 
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 11 Jul 2024 13:15:43 +0200
+ -- Dan Bungert <daniel.bungert@canonical.com>  Thu, 18 Jul 2024 15:58:53 -0600
 
-livecd-rootfs (24.04.72) noble; urgency=medium
+livecd-rootfs (24.10.5) oracular; urgency=medium
 
-  [ Heinrich Schuchardt ]
+  [ Erich Eickmeyer ]
-  * riscv64: use earlycon=sbi on command line (LP: #2068739)
+  * Switch Ubuntu Studio to generic kernel
+
+  [ Zhaoxuan Zhai ]
+  * support config sector size in ubuntu-image
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Build qcow2 images for ubuntu-core LXD support.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 11 Jul 2024 12:57:54 +0200
+
+livecd-rootfs (24.10.4) oracular; urgency=medium
 
   [ Philip Roche ]
-  * Revert removal of unminimize call in server builds (LP: #2069828)
+  * Revert removal of unminimize call in server builds. (LP: #2069828)
 
- -- Philip Roche <phil.roche@canonical.com>  Mon, 24 Jun 2024 14:24:52 +0100
+  [ Utkarsh Gupta ]
+  * Use packaged unminimize in the ubuntu-server images.
+  * Drop unminimize spit out by livecd-rootfs.
 
-livecd-rootfs (24.04.71) noble; urgency=medium
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Wed, 19 Jun 2024 22:02:39 +0530
 
-  * Re-enable ability to build HyperV desktop images (LP: #2064280)
+livecd-rootfs (24.10.3) oracular; urgency=medium
 
- -- Philip Roche <phil.roche@canonical.com>  Mon, 27 May 2024 12:05:33 +0100
+  [ Heinrich Schuchardt ]
- 
+  * riscv64: use earlycon=sbi on command line
-livecd-rootfs (24.04.70) noble; urgency=medium
+
+  [ Michael Hudson-Doyle ]
+  * Add 'ubuntu-core-installer' project.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 11 Jun 2024 11:51:14 +1200
+
+livecd-rootfs (24.10.2) oracular; urgency=medium
+
+  [ Michael Hudson-Doyle ]
+  * Replace 'ubuntustudio-dvd' project with an almost identical 'ubuntustudio'
+    project.
+
+  [ Philip Roche ]
+  * No longer install LXD snap in unminimize script (LP: #2066905)
+
+ -- Philip Roche <phil.roche@canonical.com>  Thu, 23 May 2024 14:11:57 +0100
+
+livecd-rootfs (24.10.1) oracular; urgency=medium
 
   [ Łukasz 'sil2100' Zemczak ]
   * Add experimental support for building ubuntu-core-desktop installer images
     (LP: #2063203)
 
   [ Philip Roche ]
-  * No longer install LXD snap in unminimize script (LP: #2066905) 
+  * Re-enable ability to build HyperV desktop images (LP: #2064280)
 
- -- Philip Roche <phil.roche@canonical.com>  Fri, 24 May 2024 15:47:48 +0100
+ -- Philip Roche <phil.roche@canonical.com>  Tue, 30 Apr 2024 17:58:43 +0100
 
 livecd-rootfs (24.04.69) noble; urgency=medium
 
@@ -400,7 +790,7 @@ livecd-rootfs (24.04.43) noble; urgency=medium
     grub updates in cloud images (LP: #2054103)
 
  -- Philip Roche <phil.roche@canonical.com>  Fri, 23 Feb 2024 13:54:57 +0000
- 
+
 livecd-rootfs (24.04.42) noble; urgency=medium
 
   [ Sean Davis ]
@@ -526,8 +916,8 @@ livecd-rootfs (24.04.27) noble; urgency=medium
 livecd-rootfs (24.04.26) noble; urgency=medium
 
   [ Steve Langasek ]
-  * Share live-build/ubuntu/hooks/020-ubuntu-live.chroot_early across 
+  * Share live-build/ubuntu/hooks/020-ubuntu-live.chroot_early across
-    all flavors using new-style layered squashfs, removing need for 
+    all flavors using new-style layered squashfs, removing need for
     kernel commandline options in debian-cd.
 
   [ dann frazier ]
@@ -659,7 +1049,7 @@ livecd-rootfs (24.04.10) noble; urgency=medium
   * Set C.UTF-8 locale in /etc/default/locale for all images; originally
     intended to be landed in the cosmic cycle..
   * Project name for Ubuntu Studio needs to be 'ubuntustudio-dvd'
-    throughout, not 'ubuntustudio'.  
+    throughout, not 'ubuntustudio'.
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 08 Dec 2023 15:07:41 -0800
 
@@ -738,7 +1128,7 @@ livecd-rootfs (24.04.2) noble; urgency=medium
     instead of /boot/vmlinuz. (LP: #2038957)
 
  -- Philip Roche <phil.roche@canonical.com>  Thu, 26 Oct 2023 17:56:00 +0100
- 
+
 livecd-rootfs (24.04.1) noble; urgency=medium
 
   [ Steve Langasek ]

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,10 +1,12 @@
 Source: livecd-rootfs
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper-compat (= 13)
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Standards-Version: 3.9.6
+Standards-Version: 4.7.0
 Vcs-Git: https://git.launchpad.net/livecd-rootfs -b ubuntu/master
+Vcs-Browser: https://git.launchpad.net/livecd-rootfs
+Rules-Requires-Root: no
 
 Package: livecd-rootfs
 Architecture: any

debian/copyright

@@ -11,7 +11,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License with
-your Ubuntu system, in /usr/share/common-licenses/GPL, or with the
+your Ubuntu system, in /usr/share/common-licenses/GPL-2, or with the
 livecd-rootfs source package as the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301 USA.

debian/install

@@ -4,3 +4,4 @@ get-ppa-fingerprint usr/share/livecd-rootfs
 minimize-manual usr/share/livecd-rootfs
 checkout-translations-branch usr/share/livecd-rootfs
 update-source-catalog usr/share/livecd-rootfs
+sync-mtime usr/share/livecd-rootfs

debian/livecd-rootfs.lintian-overrides

@@ -0,0 +1,10 @@
+# This is expected and okay
+livecd-rootfs: service-file-is-not-a-file [usr/share/livecd-rootfs/*.service]
+livecd-rootfs: uses-dpkg-database-directly [usr/share/livecd-rootfs/live-build/lb_chroot_layered]
+livecd-rootfs: package-contains-no-arch-dependent-files
+
+# Developer documentation in an already-expected spot
+livecd-rootfs: package-contains-documentation-outside-usr-share-doc [usr/share/livecd-rootfs/live-build/ubuntu-cpc/README.cpc.md]
+
+# This is going to occur quite a bit; we're making a livefs
+livecd-rootfs: repeated-path-segment * [*]

debian/source/lintian-overrides

@@ -0,0 +1,5 @@
+# This is expected and okay
+livecd-rootfs source: absolute-symbolic-link-target-in-source * [live-build/*]
+
+# The description indicates that it's not required in debhelper >= 13, which we have
+livecd-rootfs source: override_dh_auto_test-does-not-check-DEB_BUILD_OPTIONS [debian/rules:*]

debian/tests/default-bootstraps

@@ -78,7 +78,8 @@ live_build_rootfs() {
     echo ""
 }
 
-WORKDIR=$(mktemp -d)
+[ -d /adt ] || mkdir /adt
+WORKDIR=$(mktemp -d -p /adt)
 trap "RET=\$?; rm -rf $WORKDIR; exit \$RET" 0 INT QUIT ABRT PIPE TERM
 cd $WORKDIR
 

live-build/apparmor/6.12/capability

@@ -0,0 +1 @@
+0xffffff

live-build/apparmor/6.12/caps/extended

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/caps/mask

@@ -0,0 +1 @@
+chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read perfmon bpf checkpoint_restore

live-build/apparmor/6.12/dbus/mask

@@ -0,0 +1 @@
+acquire send receive

live-build/apparmor/6.12/domain/attach_conditions/xattr

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/change_hat

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/change_hatv

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/change_onexec

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/change_profile

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/computed_longest_left

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/disconnected.path

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/fix_binfmt_elf_mmap

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/interruptible

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/kill.signal

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/post_nnp_subset

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/stack

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/unconfined_allowed_children

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/domain/version

@@ -0,0 +1 @@
+1.2

live-build/apparmor/6.12/file/mask

@@ -0,0 +1 @@
+create read write exec append mmap_exec link lock

live-build/apparmor/6.12/io_uring/mask

@@ -0,0 +1 @@
+sqpoll override_creds

live-build/apparmor/6.12/ipc/posix_mqueue

@@ -0,0 +1 @@
+create read write open delete setattr getattr

live-build/apparmor/6.12/mount/mask

@@ -0,0 +1 @@
+mount umount pivot_root

live-build/apparmor/6.12/mount/move_mount

@@ -0,0 +1 @@
+detached

live-build/apparmor/6.12/namespaces/mask

@@ -0,0 +1 @@
+userns_create

live-build/apparmor/6.12/namespaces/pivot_root

@@ -0,0 +1 @@
+no

live-build/apparmor/6.12/namespaces/profile

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/namespaces/userns_create

@@ -0,0 +1 @@
+pciu&

live-build/apparmor/6.12/network/af_mask

@@ -0,0 +1 @@
+unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp

live-build/apparmor/6.12/network/af_unix

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/network_v8/af_inet

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/network_v8/af_mask

@@ -0,0 +1 @@
+unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp

live-build/apparmor/6.12/policy/notify/user

@@ -0,0 +1 @@
+file

live-build/apparmor/6.12/policy/outofband

@@ -0,0 +1 @@
+0x000001

live-build/apparmor/6.12/policy/permstable32_version

@@ -0,0 +1 @@
+0x000003

live-build/apparmor/6.12/policy/set_load

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/policy/state32

@@ -0,0 +1 @@
+0x000001

live-build/apparmor/6.12/policy/unconfined_restrictions/change_profile

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/policy/unconfined_restrictions/io_uring

@@ -0,0 +1 @@
+0

live-build/apparmor/6.12/policy/unconfined_restrictions/userns

@@ -0,0 +1 @@
+1

live-build/apparmor/6.12/policy/versions/v5

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/policy/versions/v6

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/policy/versions/v7

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/policy/versions/v8

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/policy/versions/v9

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/ptrace/mask

@@ -0,0 +1 @@
+read trace

live-build/apparmor/6.12/query/label/data

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/query/label/multi_transaction

@@ -0,0 +1 @@
+yes

live-build/apparmor/6.12/query/label/perms

@@ -0,0 +1 @@
+allow deny audit quiet

live-build/apparmor/6.12/rlimit/mask

@@ -0,0 +1 @@
+cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime

live-build/apparmor/6.12/signal/mask

@@ -0,0 +1 @@
+hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost

live-build/auto/build

@@ -20,8 +20,7 @@ fi
 # Link output files somewhere launchpad-buildd will be able to find them.
 PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
 
-if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ] \
+if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
-	|| [ "$PROJECT" = "ubuntu-core-desktop" ]; then
 	# Use ubuntu-image instead (or as part) of live-build
 
 	export SNAPPY_STORE_NO_CDN=1
@@ -47,41 +46,11 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ] \
 
 		# All the builds are finished now, exit
 		exit 0
-	elif [ "$PROJECT" = "ubuntu-core-desktop" ]; then
-		# Ubuntu Core Desktop payload image
-		# Special case for ubuntu-core-desktop - we need to call
-		# ubuntu-image twice, once for the core image payload and
-		# then for the actual image.
-		echo "Building the core image payload"
-		cd config/
-		/snap/bin/ubuntu-image snap $UBUNTU_IMAGE_PAYLOAD_ARGS \
-			-O output ubuntu-core-desktop*.model-assertion
-		mv output/*.img pc.img
-		xz -0 -T4 pc.img
-		rm -rf output/
-
-		# Prepare the source catalogue
-		cat install-sources-in.yaml | sed "s/@SIZE@/$(stat -c%s pc.img.xz)/g" > ../"$PREFIX".install-sources.yaml
-
-		# We need to rename the image file so that it can be pulled
-		# by the builder.
-		mv pc.img.xz ../"$PREFIX".img.xz
-
-		# We need to make sure the autoinstall file is also exported.
-		mv autoinstall.yaml ../"$PREFIX".autoinstall.yaml
-
-		# Useful to have the model-assertion exported as well.
-		mv ubuntu-core-desktop*.model-assertion ../"$PREFIX".model-assertion
-
-		# Important: return to the previous directory
-		cd ../
-
-		# Payload build finished, but now we need to build the rest with the
-		# usual live-build tools.
 	else
 		# Ubuntu classic preinstalled images
+		# --workdir is specified to avoid filling /tmp which is now a tmpfs
 		/snap/bin/ubuntu-image classic --verbose $UBUNTU_IMAGE_ARGS \
-			-O output "$IMAGE_DEFINITION"
+			--workdir work -O output "$IMAGE_DEFINITION"
 		# 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
 		# artifacts from the output directory. The image definition file
@@ -273,10 +242,11 @@ EOF
 
 		configure_universe
 
-		if [ -d chroot/var/lib/preinstalled-pool ]; then
+		for POOL_DIR in preinstalled-pool livefs-pool; do
-			cat > config/indices/apt.conf <<-EOF
+			if [ -d chroot/var/lib/$POOL_DIR ]; then
+				cat > config/indices/apt.conf <<-EOF
 Dir {
- ArchiveDir "chroot/var/lib/preinstalled-pool";
+ ArchiveDir "chroot/var/lib/$POOL_DIR";
  OverrideDir "config/indices";
  CacheDir "config/indices";
 }
@@ -291,11 +261,11 @@ Tree "dists/$LB_DISTRIBUTION"
  Contents " ";
 }
 EOF
-			for component in $LB_PARENT_ARCHIVE_AREAS; do
+				for component in $LB_PARENT_ARCHIVE_AREAS; do
-				mkdir -p chroot/var/lib/preinstalled-pool/dists/$LB_DISTRIBUTION/$component/binary-$LB_ARCHITECTURES
+					mkdir -p chroot/var/lib/$POOL_DIR/dists/$LB_DISTRIBUTION/$component/binary-$LB_ARCHITECTURES
-			done
+				done
-			apt-ftparchive generate config/indices/apt.conf
+				apt-ftparchive generate config/indices/apt.conf
-			cat << @@EOF > chroot/etc/apt/sources.list.d/preinstalled-pool.sources
+				cat << @@EOF > chroot/etc/apt/sources.list.d/$POOL_DIR.sources
 # This is a sources.list entry for a small pool of packages
 # provided on your preinstalled filesystem for your convenience.
 #
@@ -304,40 +274,41 @@ EOF
 # packages remotely instead.
 #
 Types: deb
-URIs: file:/var/lib/preinstalled-pool/
+URIs: file:/var/lib/$POOL_DIR/
 Suites: $LB_DISTRIBUTION
 Components: $LB_PARENT_ARCHIVE_AREAS
-Signed-By: /etc/apt/keyrings/preinstalled-pool.gpg
+Signed-By: /etc/apt/keyrings/$POOL_DIR.gpg
 @@EOF
 
 
-			echo "Waiting on gnupg ("$GPG_PROCESS") to finish generating a key."
+				echo "Waiting on gnupg ("$GPG_PROCESS") to finish generating a key."
-			wait $GPG_PROCESS
+				wait $GPG_PROCESS
 
-			R_ORIGIN=$(lsb_release -i -s)
+				R_ORIGIN=$(lsb_release -i -s)
-			R_CODENAME=$(lsb_release -c -s)
+				R_CODENAME=$(lsb_release -c -s)
-			R_VERSION=$(lsb_release -r -s)
+				R_VERSION=$(lsb_release -r -s)
-			R_PRETTYNAME=$(echo $R_CODENAME | sed -e 's/^\(.\)/\U\1/')
+				R_PRETTYNAME=$(echo $R_CODENAME | sed -e 's/^\(.\)/\U\1/')
 
-			apt-ftparchive -o APT::FTPArchive::Release::Origin=$R_ORIGIN \
+				apt-ftparchive -o APT::FTPArchive::Release::Origin=$R_ORIGIN \
-				-o APT::FTPArchive::Release::Label=$R_ORIGIN \
+					-o APT::FTPArchive::Release::Label=$R_ORIGIN \
-				-o APT::FTPArchive::Release::Suite=$R_CODENAME-local \
+					-o APT::FTPArchive::Release::Suite=$R_CODENAME-local \
-				-o APT::FTPArchive::Release::Version=$R_VERSION \
+					-o APT::FTPArchive::Release::Version=$R_VERSION \
-				-o APT::FTPArchive::Release::Codename=$R_CODENAME \
+					-o APT::FTPArchive::Release::Codename=$R_CODENAME \
-				-o APT::FTPArchive::Release::Description="$R_ORIGIN $R_PRETTYNAME Local" \
+					-o APT::FTPArchive::Release::Description="$R_ORIGIN $R_PRETTYNAME Local" \
-				release chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/ \
+					release chroot/var/lib/$POOL_DIR/dists/$R_CODENAME/ \
-					> config/gnupg/Release
+						> config/gnupg/Release
 
-			gpg --home config/gnupg --detach-sign --armor config/gnupg/Release
+				gpg --home config/gnupg --detach-sign --armor config/gnupg/Release
-			mv config/gnupg/Release \
+				mv config/gnupg/Release \
-				chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release
+					chroot/var/lib/$POOL_DIR/dists/$R_CODENAME/Release
-			mv config/gnupg/Release.asc \
+				mv config/gnupg/Release.asc \
-				chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release.gpg
+					chroot/var/lib/$POOL_DIR/dists/$R_CODENAME/Release.gpg
-			cp config/gnupg/pubring.gpg chroot/etc/apt/keyrings/preinstalled-pool.gpg
+				cp config/gnupg/pubring.gpg chroot/etc/apt/keyrings/$POOL_DIR.gpg
-			find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm
+				find chroot/var/lib/$POOL_DIR/ -name Packages | xargs rm
-			# We only want to have a cache for the pre-installed pool at this point
+				# We only want to have a cache for the pre-installed pool at this point
-			Chroot chroot "apt-get update -o Dir::Etc::SourceParts=/dev/null -oDir::Etc::SourceList=etc/apt/sources.list.d/preinstalled-pool.sources"
+				Chroot chroot "apt-get update -o Dir::Etc::SourceParts=/dev/null -oDir::Etc::SourceList=etc/apt/sources.list.d/$POOL_DIR.sources"
-		fi
+			fi
+		done
 		case $PROJECT:$SUBPROJECT in
 			*)
 				if [ -e "config/seeded-snaps" ]; then
@@ -394,7 +365,7 @@ EOF
 	#  affected by this, we manually clear out the archive-related Packages
 	#  files in the cache.
 	case $PROJECT in
-		ubuntu|xubuntu|kubuntu|ubuntu-budgie|ubuntukylin|ubuntu-mate|ubuntucinnamon|ubuntu-unity|edubuntu)
+		ubuntu|xubuntu|kubuntu|ubuntu-budgie|ubuntukylin|ubuntu-mate|ubuntucinnamon|ubuntu-unity|edubuntu|lubuntu)
 			rm -f chroot/var/lib/apt/lists/*ubuntu.com*_Packages
 			;;
 	esac
@@ -440,7 +411,7 @@ done
 # we don't need a manifest-remove for a layered-aware installer
 # here we have a list of all new-installer flavors
 case $PROJECT in
-	ubuntu|ubuntu-budgie)
+	ubuntu|ubuntu-budgie|lubuntu)
 		rm -f livecd.${PROJECT}-manifest-remove
 		rm -f config/manifest-minimal-remove
 		;;
@@ -498,7 +469,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 		continue
 	fi
 	case $FLAVOUR in
-		allwinner|virtual|generic-hwe-*|lowlatency-hwe-*)
+		allwinner|virtual|generic-hwe-*)
 			FLAVOUR="generic"
 			;;
 		oem-*)
@@ -510,6 +481,12 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 		intel-iotg*)
 			FLAVOUR="intel-iotg"
 			;;
+		lowlatency-hwe-*)
+			FLAVOUR="lowlatency"
+			;;
+		nvidia-hwe-*)
+			FLAVOUR="nvidia"
+			;;
 	esac
 	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 	if [ -z "$KVERS" ]; then

live-build/auto/config

@@ -1,11 +1,11 @@
-#! /bin/sh
+#!/bin/bash
 set -e
 
 case $ARCH:$SUBARCH in
 	amd64:|amd64:generic|amd64:intel-iot|\
-	arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
+	arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|arm64:nvidia|\
-	arm64:tegra|arm64:tegra-igx|arm64:tegra-jetson|\
+	arm64:tegra|arm64:tegra-igx|arm64:tegra-jetson|arm64:x13s|\
-	arm64:x13s|arm64:largemem|\
+	arm64:largemem|\
 	armhf:|\
 	i386:|\
 	ppc64el:|\
@@ -78,6 +78,14 @@ BINARY_HOOKS=
 
 APT_OPTIONS=" --yes -oDebug::pkgDepCache::AutoInstall=yes "
 
+# Should we attempt to offer both the bridge and default kernel?
+USE_BRIDGE_KERNEL=false
+# Why are we using bridge kernel?  Value is ignored for USE_BRIDGE_KERNEL=false.
+# Possible reasons are zfs, drivers.
+BRIDGE_KERNEL_REASONS="zfs,drivers"
+# When building install-sources, what kernel is the default?
+DEFAULT_KERNEL=
+
 PASSES_TO_LAYERS=false
 _PASSES_TO_LAYERS=		# Stores the initial value of PASSES_TO_LAYERS
 PASSES=
@@ -383,7 +391,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
 					;;
 			esac
 			;;
-		ubuntu-server:live|ubuntu-mini-iso:|ubuntu-core-installer:)
+		ubuntu-server:live|ubuntu-mini-iso:|ubuntu-core-installer:*)
 			IMAGEFORMAT=plain
 			;;
 	esac
@@ -423,17 +431,19 @@ case $IMAGEFORMAT in
 		PREINSTALLED=true
 		;;
 	plain)
+		fs=$IMAGEFORMAT
 		case $PROJECT:${SUBPROJECT:-} in
-			ubuntu-server:live|ubuntu-core-installer:)
+			ubuntu-server:live|ubuntu-core-installer:*)
-	                        touch config/universe-enabled
+				touch config/universe-enabled
 				;;
 			ubuntu-mini-iso:)
+				fs=none
 				;;
 			*)
 				PREINSTALLED=true
 				;;
 		esac
-		OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
+		OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $fs"
 		;;
 
 	ubuntu-image)
@@ -469,6 +479,9 @@ case $IMAGEFORMAT in
 			echo "$NOW" > config/disk-info
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --disk-info config/disk-info"
 		fi
+		if [ -n "$SECTOR_SIZE" ]; then
+			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --sector-size=$SECTOR_SIZE"
+		fi
 
 		if [ $PROJECT = "ubuntu-core" ]; then
 			# snap-based core images
@@ -526,7 +539,6 @@ case $IMAGEFORMAT in
 				UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --snap=$snap"
 			done
 			echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
-			echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 			# Store model assertion in top dir to get it picked up later as a build artifact
 			env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
 			echo "Configured ubuntu-image for the following model assertion:"
@@ -556,6 +568,7 @@ case $IMAGEFORMAT in
 		# Save the model name used for building, mostly for any model-specific hook execution
 		echo "MODEL=$MODEL" >> config/common
 		echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
+		echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 		# Fake finished configuration for lb build
 		mkdir -p .build
 		touch .build/config
@@ -570,7 +583,7 @@ case $IMAGEFORMAT in
 		;;
 	*)
 		case $PROJECT in
-			kubuntu|lubuntu|ubuntu-unity)
+			kubuntu|ubuntu-unity)
 				add_package live casper
 				;;
 		esac
@@ -639,7 +652,7 @@ case $PROJECT in
 	edubuntu|ubuntu-budgie|ubuntucinnamon|ubuntukylin)
 		COMPONENTS='main restricted universe'
 		;;
-	lubuntu|kubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|xubuntu)
+	lubuntu|kubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio|xubuntu)
 		COMPONENTS='main restricted universe multiverse'
 		;;
 esac
@@ -660,9 +673,11 @@ if ! [ -e config/germinate-output/structure ]; then
                 -s $FLAVOUR.$SUITE $GERMINATE_ARG -a $ARCH)
 fi
 
-do_layered_desktop_image() {
+# Common functionality for layered desktop images
+common_layered_desktop_image() {
 	touch config/universe-enabled
 	PASSES_TO_LAYERS="true"
+
 	if [ -n "$HAS_MINIMAL" ]; then
 		if [ -z "$MINIMAL_TASKS" ]; then
 			MINIMAL_TASKS="${FLAVOUR}-desktop-minimal"
@@ -672,8 +687,13 @@ do_layered_desktop_image() {
 		fi
 		# the minimal layer, for minimal installs
 		add_task minimal minimal standard $MINIMAL_TASKS
+		# If Dracut is enabled, include it early
+		if [ -n "$NEEDS_DRACUT" ]; then
+			add_package minimal dracut
+		fi
 		# fixme: this should go in seeds, not be in code here
 		add_package minimal cloud-init
+		add_package minimal linux-$KERNEL_FLAVOURS
 		MINIMAL_PREFIX=minimal.
 	fi
 
@@ -689,6 +709,7 @@ do_layered_desktop_image() {
 		if [ -z "$HAS_MINIMAL" ]; then
 			STANDARD_TASKS="minimal standard $STANDARD_TASKS"
 			add_package standard cloud-init
+			add_package standard linux-$KERNEL_FLAVOURS
 		fi
 		add_task ${MINIMAL_PREFIX}standard $STANDARD_TASKS
 		LIVE_PREFIX="${LIVE_PREFIX}standard."
@@ -697,7 +718,14 @@ do_layered_desktop_image() {
 	# the live layer, contains all packages for the live session installer
 	[ -n "$LIVE_TASK" ] || LIVE_TASK=${FLAVOUR}-live
 	add_task ${LIVE_PREFIX}live "$LIVE_TASK"
-	add_package ${LIVE_PREFIX}live linux-$KERNEL_FLAVOURS casper
+	add_package ${LIVE_PREFIX}live casper
+
+	# If Dracut is enabled, ensure it is removed in the live layer
+	# casper still depends on initramfs-tools
+	if [ -n "$NEEDS_DRACUT" ]; then
+		remove_package ${LIVE_PREFIX}live dracut
+		add_package ${LIVE_PREFIX}live initramfs-tools
+	fi
 
 	if [ -n "$LANGUAGE_BASE" ]; then
 		# language support
@@ -736,6 +764,11 @@ do_layered_desktop_image() {
 	else
 		STANDARD_IS_DEFAULT=yes
 	fi
+}
+
+# Function for standard layered desktop image
+do_layered_desktop_image() {
+	common_layered_desktop_image
 
 	if [ -n "$HAS_MINIMAL" ]; then
 		[ -n "$MINIMAL_NAME" ] \
@@ -765,6 +798,8 @@ do_layered_desktop_image() {
 		EOF
 	fi
 
+	DEFAULT_KERNEL="linux-$KERNEL_FLAVOURS"
+
 	if [ "$LOCALE_SUPPORT" != none ]; then
 		/usr/share/livecd-rootfs/checkout-translations-branch \
 			https://git.launchpad.net/subiquity po \
@@ -809,6 +844,16 @@ case $PROJECT in
 				HAS_DEFAULT_LANGUAGES=yes
 				LANGUAGE_BASE=desktop
 				KERNEL_FLAVOURS='generic-hwe-24.04'
+
+				case $SUBARCH in
+					nvidia)
+						KERNEL_FLAVOURS="nvidia-hwe-24.04"
+						;;
+					*)
+						# nothing to do here.
+						;;
+				esac
+				
 				do_layered_desktop_image
 
 				# Enchanced secureboot stuff
@@ -844,26 +889,6 @@ case $PROJECT in
 		esac
 		;;
 
-	ubuntu-core-desktop)
-		touch config/universe-enabled
-		KERNEL_FLAVOURS='generic-hwe-24.04'
-		PASSES_TO_LAYERS="true"
-
-		# the minimal layer, for minimal installs
-		add_task minimal minimal
-		# the live layer, contains all packages for the live session installer
-		add_snap minimal.live ubuntu-core-desktop-installer/classic core22 snapd
-		add_package minimal.live linux-$KERNEL_FLAVOURS plymouth-theme-spinner squashfs-tools snapd cloud-init gsettings-desktop-schemas yaru-theme-gtk lshw
-
-		echo "Configuring for additional payload preparation"
-		UBUNTU_IMAGE_PAYLOAD_ARGS="--image-size 12G"
-		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
-		echo "UBUNTU_IMAGE_PAYLOAD_ARGS=\"$UBUNTU_IMAGE_PAYLOAD_ARGS\"" >> config/common
-		;;
-
 	ubuntu-oem)
 		HAS_MINIMAL=yes
 		MINIMAL_NAME="Ubuntu Desktop for OEM (minimal)"
@@ -881,7 +906,6 @@ case $PROJECT in
 		add_task install minimal standard
 		add_task install kubuntu-desktop
 		LIVE_TASK='kubuntu-live'
-		KERNEL_FLAVOURS='generic-hwe-24.04'
 		add_chroot_hook remove-gnome-icon-cache
 		;;
 
@@ -891,7 +915,7 @@ case $PROJECT in
 		MINIMAL_TASKS=edubuntu-desktop-gnome-minimal
 		MINIMAL_DESC="A minimal installation of the Edubuntu Desktop."
 		STANDARD_TASKS=edubuntu-desktop-gnome
-		KERNEL_FLAVOURS='generic-hwe-24.04'
+		KERNEL_FLAVOURS=generic
 		do_layered_desktop_image
 		;;
 
@@ -900,21 +924,32 @@ case $PROJECT in
 		UCFLAVOUR="Ubuntu Cinnamon"
 		HAS_MINIMAL=yes
 		MINIMAL_DESC="A minimal installation of the $UCFLAVOUR Desktop."
-		KERNEL_FLAVOURS='generic-hwe-24.04'
+		KERNEL_FLAVOURS=generic
 		do_layered_desktop_image
 		;;
 
-	lubuntu|ubuntu-unity)
+	ubuntu-unity)
 		add_task install minimal standard ${PROJECT}-desktop
 		LIVE_TASK=${PROJECT}-live
-		KERNEL_FLAVOURS='generic-hwe-24.04'
 		;;
+
+	lubuntu)
+		UCFLAVOUR="Lubuntu"
+		HAS_MINIMAL=yes
+		PASSES_TO_LAYERS="true"
+		MINIMAL_TASKS=lubuntu-desktop-minimal
+		MINIMAL_DESC="A minimal installation of the $UCFLAVOUR Desktop."
+		KERNEL_FLAVOURS=generic
+		NEEDS_DRACUT=yes
+		common_layered_desktop_image
+		;;
+
 	ubuntukylin)
 		# Ubuntu Kylin now ships the new installer.
 		UCFLAVOUR="Ubuntu Kylin"
 		HAS_MINIMAL=yes
 		MINIMAL_DESC="A minimal installation of the $UCFLAVOUR Desktop."
-		KERNEL_FLAVOURS='generic-hwe-24.04'
+		KERNEL_FLAVOURS=generic
 		do_layered_desktop_image
 		;;
 
@@ -924,7 +959,7 @@ case $PROJECT in
 		MINIMAL_TASKS=xubuntu-minimal
 		MINIMAL_NAME="Xubuntu Minimal"
 		MINIMAL_DESC="A minimal installation of the Xubuntu Desktop."
-		KERNEL_FLAVOURS='generic-hwe-24.04'
+		KERNEL_FLAVOURS=generic
 		case ${SUBPROJECT:-} in
 			minimal)
 				HAS_STANDARD=no
@@ -950,16 +985,18 @@ case $PROJECT in
 		HAS_MINIMAL=yes
 		MINIMAL_TASKS=ubuntu-mate-core
 		MINIMAL_DESC="A minimal installation of the $UCFLAVOUR Desktop."
-		KERNEL_FLAVOURS='generic-hwe-24.04'
+		KERNEL_FLAVOURS=generic
 		do_layered_desktop_image
 		;;
 
-	ubuntustudio-dvd)
+	ubuntustudio)
 		# By default Ubuntu Studio now ships the new installer.
 		UCFLAVOUR="Ubuntu Studio"
-		STANDARD_TASKS="ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography"
+		HAS_MINIMAL=yes
-		LIVE_TASK=ubuntustudio-dvd-live
+		MINIMAL_TASKS=ubuntustudio-desktop-core
-		KERNEL_FLAVOURS='lowlatency-hwe-24.04'
+		MINIMAL_DESC="A minimal installation of $UCFLAVOUR. Customize afterwards with $UCFLAVOUR Installer."
+		STANDARD_DESC="A full installation of $UCFLAVOUR."
+		KERNEL_FLAVOURS=generic
 		do_layered_desktop_image
 		;;
 
@@ -972,6 +1009,14 @@ case $PROJECT in
 				add_package ubuntu-server-minimal lxd-installer
 				add_task ubuntu-server-minimal.ubuntu-server minimal standard server
 				add_package ubuntu-server-minimal.ubuntu-server cloud-init
+				# If we have a multipath disk with LVM on top, we want to give
+				# multipath a chance to create the /dev/mapper/mpatha entry
+				# during the initramfs phase. Otherwise LVM will "steal" the
+				# device (e.g., /dev/sda2) and prevent multipath from using it
+				# after pivoting to the root filesystem of the live
+				# environment.
+				# See LP: #2080474 and LP: #1480399.
+				add_package ubuntu-server-minimal.ubuntu-server.installer multipath-tools-boot
 
 				add_task ubuntu-server-minimal.ubuntu-server.installer server-live
 
@@ -993,10 +1038,15 @@ case $PROJECT in
 						variants='tegra-jetson'
 						;;
 					largemem)
-						variants='ga-64k hwe-64k'
+						# variants='ga-64k hwe-64k'
+						variants='ga-64k'
+						;;
+					nvidia)
+						variants='nvidia'
 						;;
 					*)
-						variants='ga hwe'
+						# variants='ga hwe'
+						variants='ga'
 						;;
 				esac
 
@@ -1005,6 +1055,7 @@ case $PROJECT in
 					variants='ga'
 				fi
 
+				first_kernel=y
 				for variant in $variants; do
 					if [ "$variant" = "ga" ]; then
 						kernel_metapkg=linux-generic
@@ -1030,12 +1081,21 @@ case $PROJECT in
 					elif [ "$variant" = "tegra-jetson" ]; then
 						kernel_metapkg=linux-nvidia-tegra-jetson
 						flavor=nvidia-tegra-jetson
+					elif [ "$variant" = "nvidia" ]; then
+						kernel_metapkg=linux-nvidia-hwe-$(lsb_release -sr)
+						flavor=nvidia
 					else
 						echo "bogus variant: $variant"
 						exit 1
 					fi
 
+					if [ "$first_kernel" = "y" ]; then
+						# Put the first kernel offered into the base layer
+						first_kernel=n
+						add_package ubuntu-server-minimal $kernel_metapkg
+					fi
 					add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor $kernel_metapkg
+
 					LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor"
 				done
 				case $ARCH in
@@ -1051,6 +1111,7 @@ case $PROJECT in
 				esac
 				NO_SQUASHFS_PASSES=ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot
 
+				DEFAULT_KERNEL="$kernel_metapkg"
 				/usr/share/livecd-rootfs/checkout-translations-branch \
 					https://git.launchpad.net/subiquity po config/catalog-translations
 				;;
@@ -1068,12 +1129,19 @@ case $PROJECT in
 	    # installer but it has a source catalog entry that points to the model
 	    # created in ubuntu-core-installer/hooks/05-prepare-image.binary, which
 	    # subiquity knows how to install.
+	    if [ ${SUBPROJECT} == "desktop" ]; then
+		cp /usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-core-desktop-24-amd64.model-assertion config/
+	    fi
 	    OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 	    PASSES_TO_LAYERS=true
 	    add_task base server-minimal server
 	    add_task base.live server-live
 	    add_package base.live linux-image-generic
 
+	    # Core installer images use the pc-kernel snap for its kernel
+	    USE_BRIDGE_KERNEL=false
+	    DEFAULT_KERNEL="snap:pc-kernel"
+
 	    /usr/share/livecd-rootfs/checkout-translations-branch \
 		https://git.launchpad.net/subiquity po config/catalog-translations
 	    ;;
@@ -1088,7 +1156,6 @@ case $PROJECT in
 		add_package install mini-iso-tools linux-generic
 		case $ARCH in
 			amd64)
-				add_package install cd-boot-images-amd64
 				;;
 			*)
 				echo "unexpected architecture for $PROJECT: '$ARCH'"
@@ -1097,21 +1164,10 @@ case $PROJECT in
 		esac
 		;;
 
-	ubuntu-base)
+	ubuntu-base|ubuntu-oci)
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;
 
-	ubuntu-oci)
-		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
-		if [ "${SUBPROJECT:-}" = minimized ]; then
-			# As unminimize has been spit out from livecd-rootfs into a new
-			# separate pacakge, users have been reporting this as a regression for
-			# Noble. So we'd like to add the unminimize package; cf: LP: #2078583.
-			APT_OPTIONS="${APT_OPTIONS:+$APT_OPTIONS }--no-install-recommends"
-			add_package install unminimize
-		fi
-		;;
-
 	ubuntu-wsl)
 		add_task install minimal ubuntu-wsl
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
@@ -1162,9 +1218,6 @@ case $PROJECT in
 			riscv64*)
 				if [ -n "$SUBARCH" ]; then
 					case "${SUBARCH:-}" in
-						nezha|licheerv)
-							KERNEL_FLAVOURS=allwinner
-							;;
 						visionfive)
 							KERNEL_FLAVOURS=starfive
 							;;
@@ -1353,6 +1406,9 @@ echo "BUILDSTAMP=\"$NOW\"" >> config/binary
 echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
 echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary
 echo "CHANNEL=\"${CHANNEL:-}\"" >> config/binary
+echo "USE_BRIDGE_KERNEL=\"${USE_BRIDGE_KERNEL:-}\"" >> config/binary
+echo "BRIDGE_KERNEL_REASONS=\"${BRIDGE_KERNEL_REASONS:-}\"" >> config/binary
+echo "DEFAULT_KERNEL=\"${DEFAULT_KERNEL:-}\"" >> config/binary
 
 if [ "${IMAGE_HAS_HARDCODED_PASSWORD:-}" = "1" ]; then
 	echo IMAGE_HAS_HARDCODED_PASSWORD=1 >> config/binary
@@ -1460,28 +1516,11 @@ Pin-Priority: 500
 EOF
 fi
 
-case $PROJECT:${SUBPROJECT:-} in
-	*-dvd:*)
-		. config/bootstrap
-
-		cat > config/archives/dvd.list.binary << EOF
-deb $LB_PARENT_MIRROR_BINARY $SUITE universe multiverse
-deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse
-deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse
-EOF
-		if [ "$PROPOSED" ]; then
-			cat >> config/archives/dvd.list.binary << EOF
-deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed universe multiverse
-EOF
-		fi
-		;;
-esac
-
 case $PROJECT:${SUBPROJECT:-} in
 	ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
 		ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
-		ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
+		ubuntustudio:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
-	        ubuntukylin:*|ubuntu-mate:*|ubuntu-core-desktop:*|ubuntu-core-installer:*)
+	        ubuntukylin:*|ubuntu-mate:*|ubuntu-core-installer:*|lubuntu:*)
 		# Ensure that most things e.g. includes.chroot are copied as is
 		for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
 			case $entry in
@@ -1516,8 +1555,8 @@ case $PROJECT:${SUBPROJECT:-} in
 esac
 
 case $PROJECT in
-	ubuntu-oem|ubuntustudio-dvd|edubuntu|ubuntu-budgie|ubuntucinnamon| \
+	ubuntu-oem|ubuntustudio|edubuntu|ubuntu-budgie|ubuntucinnamon| \
-	xubuntu|ubuntukylin|ubuntu-mate)
+	xubuntu|ubuntukylin|ubuntu-mate|lubuntu)
 		cp -af /usr/share/livecd-rootfs/live-build/ubuntu/includes.chroot \
 			config/includes.chroot
 
@@ -1565,8 +1604,8 @@ if [ "$EXTRA_PPAS" ]; then
 		extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")"
 
 		cat >> config/archives/extra-ppas.list.chroot <<EOF
-deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
+deb https://ppa.launchpadcontent.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
-deb-src http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
+deb-src https://ppa.launchpadcontent.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
 EOF
 
 		if [ -n "$extra_ppa_pin" ]; then

live-build/buildd/hooks/03-network.binary

@@ -0,0 +1,12 @@
+#!/bin/bash -eux
+
+. config/functions
+
+chroot_dir=chroot
+
+# Networking interface configuration relies udev.
+# In normal LXD images, it's a transitive depends of ubuntu-cloud-minimal
+# seed, which isn't present in buildd images.
+chroot "$chroot_dir"  apt-get -y update
+env DEBIAN_FRONTEND=noninteractive chroot "$chroot_dir"  apt-get -y install udev
+chroot "$chroot_dir"  apt-get -y clean

live-build/functions

@@ -257,10 +257,13 @@ mount_disk_image() {
     mount_image ${disk_image} "${rootpart}"
     mount_partition "${rootfs_dev_mapper}" $mountpoint
 
-    local boot_dev="${loop_device}p16"
+    local boot_dev="${loop_device}p13"
     if flock -x ${loop_device} \
         [ -b ${boot_dev} -a -e $mountpoint/boot ]; then
-        flock -x ${loop_device} mount "${boot_dev}" $mountpoint/boot
+        # Only mount if assumed boot_dev is XBOOTLDR type
+        if sgdisk -i13 "${loop_device}" | grep -i BC13C2FF-59E6-4262-A352-B275FD6F7172 ; then
+            flock -x ${loop_device} mount "${boot_dev}" $mountpoint/boot
+        fi
     fi
 
     # Having one partition mounted should avoid udev-triggered partition
@@ -562,8 +565,12 @@ _snap_post_process() {
         core[0-9]*)
             # If the 'core' snap is not present, assume we are coreXX-only and
             # install the snapd snap.
+            channel=stable
+            if [ $SUBPROJECT = "dangerous" ]; then
+                channel=$CHANNEL
+            fi
             if [ ! -f ${snaps_dir}/core_[0-9]*.snap ]; then
-                _snap_preseed $CHROOT_ROOT snapd stable
+                _snap_preseed $CHROOT_ROOT snapd "$channel"
             fi
             ;;
         core)
@@ -798,12 +805,6 @@ snap_preseed() {
         exit 1
     fi
 
-    if [ $PROJECT = ubuntu-core-installer ] && [ $SNAP_NAME = subiquity ]; then
-       # The ubuntu-core-installer project requires features not yet
-       # present in the latest/ubuntu/stable-24.04 or stable branches.
-       CHANNEL=latest/ubuntu/stable-24.10
-    fi
-
     _snap_preseed $CHROOT_ROOT $SNAP $CHANNEL
 
     # Mark this image as having snapd installed explicitly.
@@ -1069,20 +1070,22 @@ EOF
         # it disables all previous network config in /etc/netplan so
         # any previous 50-cloud-init.yaml will be rendered inert.
 
-        # Position cloud-init.service After=NetworkManager.service.
+        # Position cloud-init-network.service After=NetworkManager.service.
         # (LP: #2008952. Drop-in systemd files cannot redact existing
         # dependencies (Before= or After=). So, replace the entire unit
-        # with an override in /etc/systemd/system/cloud-init.service.
+        # with an override in /etc/systemd/system/cloud-init-network.service.
         # Avoid issues reported by debsums (LP: #2069391) by not overwriting
         # unit files delivered by the cloud-init deb.
         # This drop-in will need to track any changes introduced by cloud-init
-        # SRUs which alter the cloud-init.service unit values.
+        # SRUs which alter the cloud-init-network.service unit values.
         # This override can be dropped when NetworkManager.service can run
         # Before=sysinit.target when it drops strict dbus.service dependency.
+        # 24.3 renamed cloud-init.service to cloud-init-network.service for
+        # single process mode
         mkdir -p chroot/etc/systemd/system/
-        cat <<EOF > chroot/etc/systemd/system/cloud-init.service
+        cat <<EOF > chroot/etc/systemd/system/cloud-init-network.service
 ${AUTOMATION_HEADER}
-# Based on cloud-init 24.2 for Desktop LiveCD
+# Based on cloud-init 24.3 for Desktop LiveCD
 # Redact sysinit.target from Before, add After=NetworkManager*.service
 # (LP: #2008952)
 [Unit]
@@ -1109,7 +1112,14 @@ ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/cloud-init init
+# This service is a shim which preserves systemd ordering while allowing a
+# single Python process to run cloud-init's logic. This works by communicating
+# with the cloud-init process over a unix socket to tell the process that this
+# stage can start, and then wait on a return socket until the cloud-init
+# process has completed this stage. The output from the return socket is piped
+# into a shell so that the process can send a completion message (defaults to
+# "done", otherwise includes an error message) and an exit code to systemd.
+ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/network.sock -s /run/cloud-init/share/network-return.sock | sh'
 RemainAfterExit=yes
 TimeoutSec=0
 
@@ -1168,9 +1178,14 @@ divert_update_initramfs () {
 		--divert /usr/sbin/update-initramfs.REAL --rename \
 		/usr/sbin/update-initramfs"
 	cat > chroot/usr/sbin/update-initramfs <<'EOF'
-#! /bin/sh
+#!/bin/sh
 if [ $# != 1 ] || [ "$1" != -u ]; then
-	exec update-initramfs.REAL "$@"
+	if [ -x /usr/sbin/update-initramfs.REAL ]; then
+		exec /usr/sbin/update-initramfs.REAL "$@"
+	else
+		echo "update-initramfs.REAL not found. Skipping execution." >&2
+		exit 0
+	fi
 fi
 echo "update-initramfs: diverted by livecd-rootfs (will be called later)" >&2
 
@@ -1326,3 +1341,39 @@ reset_snapd_state() {
     chroot "$rootdir" apt-get install --reinstall -y snapd
     teardown_mountpoint "$rootdir"
 }
+
+write_kernel_yaml() {
+    # Generate the kernel.yaml fragment used as input for
+    # update-source-catalog.
+    #
+    # the newer kernel is the default kernel!
+    # bridge is the older, fallback kernel.
+    # $1 string, default kernel, such as "linux-generic"
+    # $2 string with comma seperated list of bridge reasons,
+    #    usually "zfs,drivers"
+    local default="$1"
+    local reasons="$2"
+
+    cat <<EOF > config/kernel.yaml
+kernel:
+  default: "$default"
+EOF
+
+    # To specify fallback to a bridge kernel, construct a kernel.yaml
+    # with the following:
+    #
+    # kernel:
+    #   default: linux-foo
+    #   bridge: linux-foo-brg-YY.MM
+    #   bridge_reasons: [zfs, drivers]
+    #
+    # If an install is using zfs or "drivers", use the bridge kernel, else
+    # use the default kernel.
+
+    if $USE_BRIDGE_KERNEL ; then
+        cat <<EOF >> config/kernel.yaml
+  bridge: "${default}-brg-$(release_ver)"
+  bridge_reasons: [$reasons]
+EOF
+    fi
+}

live-build/lb_binary_layered

@@ -163,15 +163,24 @@ build_layered_squashfs () {
 			#    (rather than the default which is to skip copies based
 			#    on size + mtime)
 			#  --no-times to not copy mtimes from source to dest (we
-			#    don't care about mtime in the image and want to
+			#    do care about mtime in the image but want to
 			#    deduplicate files that have indentical contents but
-			#    different mtimes)
+			#    different mtimes, and mtime will be fixed below)
 			#  --del because we want to remove files that have been
 			#    deleted in this layer.
 			rsync -aXHAS --checksum --no-times --del chroot/ chroot-2/
 			umount chroot-2
 			rmdir chroot-2
 			overlay_dir="$overlay_dir-2"
+			# We use rsync with --no-times rsync (see above)
+			# for the absolute best size reduction.  But there are
+			# cases where we want mtime preservation to match what
+			# was found in the original archive packages, such as
+			# keeping .py mtime in sync with the matching .pyc.
+			# Operate on the upperdir directly, so that we are only
+			# modifying mtime on files that are actually changed in
+			# this layer. LP: #2107332
+			/usr/share/livecd-rootfs/sync-mtime chroot "$overlay_dir"
 		fi
 
 		create_squashfs "${overlay_dir}" ${squashfs_f}
@@ -185,7 +194,7 @@ build_layered_squashfs () {
 			if [ -f config/seeded-languages ]; then
 				usc_opts="$usc_opts --langs $(cat config/seeded-languages)"
 			fi
-			/usr/share/livecd-rootfs/update-source-catalog $usc_opts
+			/usr/share/livecd-rootfs/update-source-catalog source $usc_opts
 		else
 			echo "No catalog entry template for $pass"
 		fi
@@ -204,6 +213,13 @@ do
 	build_layered_squashfs "${_PASS}" ${*}
 done
 
+if [ -n "$DEFAULT_KERNEL" -a -f livecd.${PROJECT_FULL}.install-sources.yaml ]; then
+	write_kernel_yaml "$DEFAULT_KERNEL" "$BRIDGE_KERNEL_REASONS"
+	/usr/share/livecd-rootfs/update-source-catalog merge \
+		--output livecd.${PROJECT_FULL}.install-sources.yaml \
+		--template config/kernel.yaml
+fi
+
 # Ubiquity-compatible removal manifest for ISO not using a layered-aware installer
 if [ -n "$(ls livecd.${PROJECT_FULL}.*install.live.manifest.full 2>/dev/null)" ] && \
    [ -n "$(ls livecd.${PROJECT_FULL}.*install.manifest.full 2>/dev/null)" ]; then

live-build/lb_chroot_layered

@@ -206,13 +206,6 @@ create_chroot_pass () {
 		[ "$livepass" != "$pass" ] && continue
 		lb chroot_linux-image ${*}
 		lb chroot_live-packages ${*}
-		if [ "$LB_LINUX_PACKAGES" = "linux" ]; then
-		    for flavour in $LB_LINUX_FLAVOURS; do
-			mkdir -p chroot/etc/subiquity
-			echo "linux-$flavour" > chroot/etc/subiquity/kernel-meta-package
-			break
-		    done
-		fi
 		break
 	done
 

live-build/ubuntu-core-desktop/autoinstall.yaml

@@ -1,12 +0,0 @@
-version: 1
-source:
-  id: ubuntu-core-desktop
-  search_drivers: false
-interactive-sections:
-  - locale
-  - keyboard
-  - storage
-identity:
-  username: ubuntu
-  password: '$1$zB3Qu2ef$TKLhQpQlKRyCZGUdHFFMH/'
-  hostname: ubuntu

live-build/ubuntu-core-desktop/hooks/020-ubuntu-live.chroot_early

@@ -1,21 +0,0 @@
-#! /bin/sh
-
-set -eu
-
-case ${PASS:-} in
-    minimal.live)
-        ;;
-    *)
-        exit 0
-        ;;
-esac
-
-mkdir -p "/etc/initramfs-tools/conf.d"
-
-cat <<EOF > /etc/initramfs-tools/conf.d/casperize.conf
-export CASPER_GENERATE_UUID=1
-EOF
-
-cat <<EOF > /etc/initramfs-tools/conf.d/default-layer.conf
-LAYERFS_PATH=${PASS}.squashfs
-EOF

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/cloud/cloud.cfg

@@ -1,117 +0,0 @@
-# The top level settings are used as module
-# and system configuration.
-
-# A set of users which may be applied and/or used by various modules
-# when a 'default' entry is found it will reference the 'default_user'
-# from the distro configuration specified below
-users:
-   - default
-
-# If this is set, 'root' will not be able to ssh in and they
-# will get a message to login instead as the default $user
-disable_root: true
-
-# This will cause the set+update hostname module to not operate (if true)
-preserve_hostname: true
-
-ssh_pwauth: yes
-chpasswd:
-    expire: false
-
-# This is the initial network config.
-# It can be overwritten by cloud-init or subiquity.
-network:
-    version: 2
-    ethernets:
-        zz-all-en:
-            match:
-                name: "en*"
-            dhcp4: true
-        zz-all-eth:
-            match:
-                name: "eth*"
-            dhcp4: true
-
-# We used to have a custom final_message here.  Just use the default instead.
-
-# Example datasource config
-# datasource:
-#    Ec2:
-#      metadata_urls: [ 'blah.com' ]
-#      timeout: 5 # (defaults to 50 seconds)
-#      max_wait: 10 # (defaults to 120 seconds)
-
-# The modules that run in the 'init' stage
-cloud_init_modules:
- - bootcmd
- - write-files
- - ca-certs
- - rsyslog
- - users-groups
- - ssh
-
-# The modules that run in the 'config' stage
-cloud_config_modules:
-# Emit the cloud config ready event
-# this can be used by upstart jobs for 'start on cloud-config'.
- - ssh-import-id
- - set-passwords
- - timezone
- - disable-ec2-metadata
- - runcmd
-
-# The modules that run in the 'final' stage
-cloud_final_modules:
- - scripts-per-once
- - scripts-user
- - ssh-authkey-fingerprints
- - keys-to-console
- - phone-home
- - final-message
-
-# System and/or distro specific settings
-# (not accessible to handlers/transforms)
-system_info:
-   # This will affect which distro class gets used
-   distro: ubuntu
-   # Default user name + that default users groups (if added/used)
-   default_user:
-     name: installer
-     lock_passwd: false
-     gecos: Ubuntu
-     groups: [adm, audio, cdrom, dialout, dip, floppy, lxd, netdev, plugdev, sudo, video]
-     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
-     shell: /usr/bin/subiquity-shell
-   # Automatically discover the best ntp_client
-   ntp_client: auto
-   # Other config here will be given to the distro class and/or path classes
-   paths:
-      cloud_dir: /var/lib/cloud/
-      templates_dir: /etc/cloud/templates/
-      upstart_dir: /etc/init/
-   package_mirrors:
-     - arches: [i386, amd64]
-       failsafe:
-         primary: http://archive.ubuntu.com/ubuntu
-         security: http://security.ubuntu.com/ubuntu
-       search:
-         primary:
-           - http://%(ec2_region)s.ec2.archive.ubuntu.com/ubuntu/
-           - http://%(availability_zone)s.clouds.archive.ubuntu.com/ubuntu/
-           - http://%(region)s.clouds.archive.ubuntu.com/ubuntu/
-         security: []
-     - arches: [arm64, armel, armhf]
-       failsafe:
-         primary: http://ports.ubuntu.com/ubuntu-ports
-         security: http://ports.ubuntu.com/ubuntu-ports
-       search:
-         primary:
-           - http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/
-           - http://%(availability_zone)s.clouds.ports.ubuntu.com/ubuntu-ports/
-           - http://%(region)s.clouds.ports.ubuntu.com/ubuntu-ports/
-         security: []
-     - arches: [default]
-       failsafe:
-         primary: http://ports.ubuntu.com/ubuntu-ports
-         security: http://ports.ubuntu.com/ubuntu-ports
-   ssh_svcname: ssh

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/cloud/cloud.cfg.d/06_quiet.cfg

@@ -1,4 +0,0 @@
-output: {all: '>> /var/log/cloud-init-output.log'}
-no_ssh_fingerprints: true
-ssh:
-  emit_keys_to_console: false

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/journald.conf.d/no-rate-limit.conf

@@ -1,2 +0,0 @@
-[Journal]
-RateLimitIntervalSec=0

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/system/dev-disk-by\x2duuid-00c629d6\x2d06ab\x2d4dfd\x2db21e\x2dc3186f34105d.device.d/override.conf

@@ -1,3 +0,0 @@
-[Unit]
-JobRunningTimeoutSec=0s
-Wants=subiquity_config.mount

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/system/systemd-journald.service.d/no-compact.conf

@@ -1,4 +0,0 @@
-# systemd in 23.04+ uses a newer "compact" format by default which is not
-# understood by the systemd libraries from jammy used in the subiquity snap.
-[Service]
-Environment="SYSTEMD_JOURNAL_COMPACT=0"

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/system/systemd-journald.service.d/no-hardening.conf

@@ -1,4 +0,0 @@
-# systemd in 22.04+ uses "hash table hardening" by default which is not
-# understood by the systemd libraries from focal used in the subiquity snap.
-[Service]
-Environment="SYSTEMD_JOURNAL_KEYED_HASH=0"

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/bin/subiquity-shell

@@ -1,3 +0,0 @@
-#!/bin/sh
-exec sudo snap run subiquity
-

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/getty@.service.d/autologin.conf

@@ -1,3 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --noclear -n --autologin ubuntu-server %I $TERM

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/getty@tty1.service

@@ -1 +0,0 @@
-/dev/null

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount

@@ -1 +0,0 @@
-../media-filesystem.mount

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf

@@ -1,9 +0,0 @@
-[Unit]
-Description=Subiquity, the installer for Ubuntu Server %I
-After=snapd.seeded.service
-StartLimitInterval=0
-
-[Service]
-Environment=SNAP_REEXEC=0
-ExecStart=
-ExecStart=/usr/bin/snap run subiquity.subiquity-service %I

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf

@@ -1,4 +0,0 @@
-[Service]
-StandardOutput=tty
-ExecStart=
-ExecStart=/usr/bin/snap run subiquity --ssh

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf

@@ -1,14 +0,0 @@
-[Unit]
-IgnoreOnIsolate=yes
-After=systemd-user-sessions.service plymouth-quit-wait.service snap.seeded.service
-
-[Service]
-Environment=SNAP_REEXEC=0
-UtmpIdentifier=tty1
-TTYPath=/dev/tty1
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-KillMode=process
-IgnoreSIGPIPE=no
-SendSIGHUP=yes

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf

@@ -1,2 +0,0 @@
-[Service]
-Environment=SNAP_REEXEC=0

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/subiquity_config.mount

@@ -1,4 +0,0 @@
-[Mount]
-What=/dev/disk/by-uuid/00c629d6-06ab-4dfd-b21e-c3186f34105d
-Where=/subiquity_config
-Type=ext4

live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/systemd-networkd-wait-online

@@ -1 +0,0 @@
-/bin/true

live-build/ubuntu-core-desktop/includes.chroot/etc/hosts

@@ -1,9 +0,0 @@
-127.0.0.1	localhost.localdomain	localhost
-::1		localhost6.localdomain6	localhost6
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts

live-build/ubuntu-core-desktop/install-sources-in.yaml

@@ -1,11 +0,0 @@
-- default: true
-  description:
-    en: Ubuntu Core Desktop.
-  id: ubuntu-core-desktop
-  locale_support: none
-  name:
-    en: Ubuntu Core Desktop
-  path: filesystem.img.xz
-  type: dd-xz:file
-  size: @SIZE@
-  variant: core 

live-build/ubuntu-core-desktop/ubuntu-core-desktop-22-amd64.model-assertion

@@ -1,187 +0,0 @@
-type: model
-authority-id: canonical
-revision: 5
-series: 16
-brand-id: canonical
-model: ubuntu-core-desktop-22-amd64
-architecture: amd64
-base: core22-desktop
-display-name: Ubuntu Core Desktop 22 (amd64)
-grade: signed
-snaps:
-  -
-    default-channel: 22/stable
-    id: mZqHskGgGDECRCKP7h7ef3Rl2wTwyNfy
-    name: pc-desktop
-    type: gadget
-  -
-    default-channel: 23.10/stable
-    id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
-    name: pc-kernel
-    type: kernel
-  -
-    default-channel: latest/edge/ubuntu-core-desktop
-    id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4
-    name: snapd
-    type: snapd
-  -
-    default-channel: latest/stable
-    id: qRMmQqNDz8kRUTqFIgqk2RzNNoC7jUZ6
-    name: core22-desktop
-    type: base
-  -
-    default-channel: latest/stable
-    id: LVkazk0JLrL0ivuHRlv3wp3bK1nAgwtN
-    name: ubuntu-desktop-session
-    type: app
-  -
-    default-channel: latest/stable
-    id: amcUKQILKXHHTlmSa7NMdnXSx02dNeeT
-    name: core22
-    type: base
-  -
-    default-channel: 22/stable
-    id: RmBXKl6HO6YOC2DE4G2q1JzWImC04EUy
-    name: network-manager
-    type: app
-  -
-    default-channel: latest/stable
-    id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR
-    name: bare
-    type: base
-  -
-    default-channel: latest/stable
-    id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit
-    name: gtk-common-themes
-    type: app
-  -
-    default-channel: latest/stable
-    id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3
-    name: gnome-42-2204
-    type: app
-  -
-    default-channel: latest/stable
-    id: m1eQacDdXCthEwWQrESei3Zao3d5gfJF
-    name: cups
-    type: app
-  -
-    default-channel: latest/stable
-    id: WJKWBUuCDufOFw2p24tvkbbw02plGkbd
-    name: ipp-usb
-    type: app
-  -
-    default-channel: 22/stable
-    id: dVK2PZeOLKA7vf1WPCap9F8luxTk9Oll
-    name: avahi
-    type: app
-  -
-    default-channel: 22/stable
-    id: JmzJi9kQvHUWddZ32PDJpBRXUpGRxvNS
-    name: bluez
-    type: app
-  -
-    default-channel: latest/stable
-    id: Si21Q1kjaZpyJ8TfGbAnxJ4y6KMv7FuW
-    name: loupe
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: EDFg87ESUg9sAIlm0Vm5Wmr0LjiEonSm
-    name: evince
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable/ubuntu-23.10
-    id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk
-    name: firefox
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: J8OcDPQ0JM8dbvk29HRqpWVI9kBw0atG
-    name: gnome-calculator
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: qJcS3UjpF9AMJKWAiKwA5EWbm0y6Uduw
-    name: gnome-characters
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: 8NtSF2nXW6krsxbXBYydy1j985k6ZsVK
-    name: gnome-clocks
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: BzJuWXmCIpyjUKotXPWU2psnl8gEh4hm
-    name: gnome-font-viewer
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: kIMfmZTJspWa8vtfbgU3W9Nbv4V5Qgmh
-    name: gnome-logs
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: PZj2sEabMQrVUV1HKZmmmXSk3E6wKC9i
-    name: gnome-text-editor
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: LhzK7p8214jufMYx1kz43QkWhFnOKdbr
-    name: gnome-weather
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: J60k4JY0HppjwOjW8dZdYc8obXKxujRu
-    name: lxd
-    type: app
-  -
-    default-channel: latest/edge/ubuntu-core-desktop
-    id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu
-    name: snapd-desktop-integration
-    type: app
-  -
-    default-channel: latest/stable/ubuntu-23.10
-    id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
-    name: snap-store
-    type: app
-  -
-    default-channel: latest/stable
-    id: JMjaFobGn56fh1HepiaGuCxQgbWYnHc8
-    name: workshops
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: 9BTClmjz31r0UltmbJ5nnGe0Xm1AzfMp
-    name: gnome-system-monitor
-    presence: optional
-    type: app
-  -
-    default-channel: latest/stable
-    id: xODwiAdjx9KGChvI1z9Xx2JWJE7oLFF6
-    name: ubuntu-core-desktop-init
-    type: app
-storage-safety: prefer-encrypted
-timestamp: 2023-10-21T10:19:41+00:00
-sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
-
-AcLBXAQAAQoABgUCZTP+wgAKCRDgT5vottzAEia0D/9FyEOb4Qai+sJQ/ilVqZ1L0FicTIwa9/Ae
-khv5xXYGmukSzkIUGNYjvcCJByxgMiDsFOIIzrOYlJPmRFtdFOwm3KGS2JGthIUbQfElVbyPswZh
-cgqYVuGMiRw8udlZHOmy2rWIKxo/uLMEsZzZuk83nC+ZzAoQoHOmcELuRtIc1qz9XAf6n7pd79S2
-10cxG7vuaA1iVbqqtbSlQCAdKTdOCxw2/NHTZ8mIRtAQZGA1LP8IMEyv2Fi3FVpmN2derV78sO3f
-kCf/KdYeD6d1a03WchIDsuPlvTpTOU3TSX07QWj+WrZHMDh9gpQHDdSIWswBCPIHa10R6aDRRUUK
-/5dJDq77/CyY/Q/ivcAuFiTceghKVcx3Zci+VX2WgvLK9qYHYHSilb70nTvsDFUA/bKep57/xqeG
-j03cvUaqHb6li2T2SmyzaQOGV5MF6XxlhcLWY19PHc2/ocLpukL4vxkl18Ur3FoYAOLODwrlxueS
-FDu7u+qf+Ki2+f0ZtN70EPcFAQAJ4C0N6f9j9Z+9BQptTlVwrIzIUxIwxtkp27YvERno6bZPBRYs
-T4YdzVSdPKXsItT/GUiqYwdgPTi61FZXTN/47yIaHZLUwMT9gg/9XgNqIHKIdFHxm6GWVxL0AqOp
-JPIfqrsmVbewevzwV1Rgo1LbPKVVrjqPtW0QQlkS8w==

live-build/ubuntu-core-installer/hooks/05-prepare-image.binary

@@ -13,15 +13,29 @@ esac
 . config/binary
 . config/functions
 
-env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-core-24-amd64 > config/ubuntu-core-24-amd64.model
+case ${SUBPROJECT} in
+    desktop)
+        env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
+        config/ubuntu-core-desktop-24-amd64.model-assertion --snap firefox chroot
 
-env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
+        cat <<-EOF > config/edge.catalog-in.yaml
-    config/ubuntu-core-24-amd64.model --snap console-conf chroot
+name: "Ubuntu Core Desktop 24"
-mv chroot/system-seed/systems/* chroot/system-seed/systems/ubuntu-core-24-amd64
+description: >-
-rsync -av chroot/system-seed/{systems,snaps} chroot/var/lib/snapd/seed
+  Ubuntu Core Desktop.
-rm -rf chroot/system-seed
+id: ubuntu-core-desktop
+type: null
+variant: core
+locale_support: none
+snapd_system_label: ubuntu-core-desktop-24-amd64
+EOF
+        mv chroot/system-seed/systems/* chroot/system-seed/systems/ubuntu-core-desktop-24-amd64
+        ;;
+    *)
+        env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-core-24-amd64 > config/ubuntu-core-24-amd64.model
+        env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
+            config/ubuntu-core-24-amd64.model --snap console-conf chroot
 
-cat <<-EOF > config/edge.catalog-in.yaml
+        cat <<-EOF > config/edge.catalog-in.yaml
 name: "Ubuntu Core 24"
 description: >-
   Ubuntu Core.
@@ -31,8 +45,15 @@ variant: core
 locale_support: none
 snapd_system_label: ubuntu-core-24-amd64
 EOF
+        mv chroot/system-seed/systems/* chroot/system-seed/systems/ubuntu-core-24-amd64
+        ;;
+esac
+
+rsync -av chroot/system-seed/{systems,snaps} chroot/var/lib/snapd/seed
+rm -rf chroot/system-seed
+
 PROJECT_FULL=$PROJECT${SUBARCH:+-$SUBARCH}
 usc_opts="--output livecd.${PROJECT_FULL}.install-sources.yaml \
-	  --template config/edge.catalog-in.yaml \
+          --template config/edge.catalog-in.yaml \
-	  --size 0"
+          --size 0"
-/usr/share/livecd-rootfs/update-source-catalog $usc_opts
+/usr/share/livecd-rootfs/update-source-catalog source $usc_opts

live-build/ubuntu-core-installer/includes.chroot.base.live/etc/cloud/cloud.cfg

@@ -18,20 +18,6 @@ ssh_pwauth: yes
 chpasswd:
     expire: false
 
-# This is the initial network config.
-# It can be overwritten by cloud-init or subiquity.
-network:
-    version: 2
-    ethernets:
-        zz-all-en:
-            match:
-                name: "en*"
-            dhcp4: true
-        zz-all-eth:
-            match:
-                name: "eth*"
-            dhcp4: true
-
 # We used to have a custom final_message here.  Just use the default instead.
 
 # Example datasource config

live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf

@@ -3,6 +3,5 @@ Description=Subiquity, the installer for Ubuntu Server %I
 StartLimitInterval=0
 
 [Service]
-Environment=SNAP_REEXEC=0
 ExecStart=
 ExecStart=/usr/bin/snap run subiquity.subiquity-service %I

live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf

@@ -2,7 +2,6 @@
 IgnoreOnIsolate=yes
 
 [Service]
-Environment=SNAP_REEXEC=0
 UtmpIdentifier=tty1
 TTYPath=/dev/tty1
 TTYReset=yes

live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf

@@ -1,2 +0,0 @@
-[Service]
-Environment=SNAP_REEXEC=0

live-build/ubuntu-core-installer/ubuntu-core-desktop-24-amd64.model-assertion

@@ -0,0 +1,120 @@
+type: model
+authority-id: canonical
+series: 16
+brand-id: canonical
+model: ubuntu-core-desktop-24-amd64
+architecture: amd64
+base: core24-desktop
+display-name: Ubuntu Core Desktop 24 (amd64)
+grade: signed
+snaps:
+  -
+    default-channel: 24/stable
+    id: mZqHskGgGDECRCKP7h7ef3Rl2wTwyNfy
+    name: pc-desktop
+    type: gadget
+  -
+    default-channel: 24-hwe/stable
+    id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
+    name: pc-kernel
+    type: kernel
+  -
+    default-channel: latest/edge/ubuntu-core-desktop
+    id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4
+    name: snapd
+    type: snapd
+  -
+    default-channel: latest/stable
+    id: GY5GohJ4F1ZsWpkosG0joeZyDfHzTZrD
+    name: core24-desktop
+    type: base
+  -
+    default-channel: 24/stable
+    id: LVkazk0JLrL0ivuHRlv3wp3bK1nAgwtN
+    name: ubuntu-desktop-session
+    type: app
+  -
+    default-channel: latest/stable
+    id: amcUKQILKXHHTlmSa7NMdnXSx02dNeeT
+    name: core22
+    type: base
+  -
+    default-channel: latest/stable
+    id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM
+    name: core24
+    type: base
+  -
+    default-channel: 24/stable
+    id: RmBXKl6HO6YOC2DE4G2q1JzWImC04EUy
+    name: network-manager
+    type: app
+  -
+    default-channel: latest/stable
+    id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR
+    name: bare
+    type: base
+  -
+    default-channel: latest/stable
+    id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit
+    name: gtk-common-themes
+    type: app
+  -
+    default-channel: latest/stable
+    id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3
+    name: gnome-42-2204
+    type: app
+  -
+    default-channel: latest/stable
+    id: m1eQacDdXCthEwWQrESei3Zao3d5gfJF
+    name: cups
+    type: app
+  -
+    default-channel: latest/stable
+    id: WJKWBUuCDufOFw2p24tvkbbw02plGkbd
+    name: ipp-usb
+    type: app
+  -
+    default-channel: 24/stable
+    id: dVK2PZeOLKA7vf1WPCap9F8luxTk9Oll
+    name: avahi
+    type: app
+  -
+    default-channel: 24/stable
+    id: JmzJi9kQvHUWddZ32PDJpBRXUpGRxvNS
+    name: bluez
+    type: app
+  -
+    default-channel: latest/stable/ubuntu-24.04
+    id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk
+    name: firefox
+    presence: optional
+    type: app
+  -
+    default-channel: latest/edge/ubuntu-core-desktop
+    id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu
+    name: snapd-desktop-integration
+    type: app
+  -
+    default-channel: latest/stable/ubuntu-24.04
+    id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
+    name: snap-store
+    type: app
+  -
+    default-channel: latest/candidate
+    id: tBdYpKjXcW5farGGJaWiYXrxIwMVMtx5
+    name: ubuntu-desktop-init
+    type: app
+storage-safety: prefer-encrypted
+timestamp: 2024-07-04T10:33:44+08:00
+sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
+
+AcLBXAQAAQoABgUCZoYTygAKCRDgT5vottzAEnlLD/4toc4w5IiLm/xmBFL8BVwXXVQsvNNtVYaT
+NGSa+q7OJXeVbPQnnRMK4oH31IbGFngK3IHoc04LK76W2GQzAE4SQxTcV9VTlyPrVc6OeCn9rSWj
+zFX/fOVuD5Wd6OOgNitaHqVHh8CDQFcsdOBICImHG6s0Au1mIDVQvV/DxcnnprJ53yXFCeastuX+
+CnZiB6wOv/dzGHnIbhpUtKg5HV5jZoIkmplWAZr1IXd8gAPvltDzpJYwN6GMHK6SLUD1tgviP4ZB
+gw9IT11DCeB9TOEnsAs7y1YApUdkxMSv4B+Jwew/lkjysncULqFCt6fCD3HEw+OdULb/OrFnYcSV
+4NqPBop/9mi+CB5Fs3ubtlKxK9VnSJbLpXsyBeDvljVKp0MvNBpCTJnlGtRvQE/bHLpaAhRRsP0R
+6cUqd1ieRm4wp/1/v+zMjdp6VL7co0/a6jZgtfptCMnCC6Z0KdLWGQjaXDwxNStqMK3h/Au2YWDc
+ZgZ/+wTxMlDyU4i4gg+rByV2yPHfGeVpN7D7nuY8OWXq1ezESY6K5fsOW77/XEjZJOI3BFOJ6Xnl
+2ATKBs6uSmMPQSZo21sk+E0c2gH8qj6L6mUcAz2qvilur9w4uEM3TRfZcAKPN+8lV44eB8/aZpq7
+GfjsXFa+DpXJzWdC91SP4yIeojoj3OAl4gNwt0c85g==

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

@@ -9,6 +9,9 @@ esac
 
 IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 FS_LABEL="cloudimg-rootfs"
+# 2.4G GiB
+# Since Plucky, ppc64el need more than the default 2.2GiB
+IMAGE_SIZE=2576980378
 
 . config/binary
 

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

@@ -284,6 +284,7 @@ install_grub() {
                         echo "Reducing initramfs size for ${SUBARCH} board"
                         mkdir -p mountpoint/etc/initramfs-tools/conf.d/
                         cp ${my_d}/riscv64/initramfs-tools/modules_list.conf mountpoint/etc/initramfs-tools/conf.d/
+                        cat ${my_d}/riscv64/initramfs-tools/allwinner >> mountpoint/etc/initramfs-tools/modules
                         chroot mountpoint update-initramfs -c -v -k all
                         echo "Installing U-Boot for ${SUBARCH} board"
                         if [ "$SUBARCH" = "licheerv" ]; then

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

@@ -39,26 +39,26 @@ create_partitions() {
             sgdisk "${disk_image}" \
                    --new=15:0:204800 \
                    --typecode=15:ef00 \
-                   --new=16::1G \
+                   --new=13::1G \
-                   --typecode=16:ea00 \
+                   --typecode=13:ea00 \
                    --new=1:
             ;;
         riscv64)
             sgdisk "${disk_image}" \
                    --set-alignment=2 \
+                   --new=13::1G \
+                   --typecode=13:ea00 \
                    --new=15::+106M \
                    --typecode=15:ef00 \
-                   --new=16::1G \
-                   --typecode=16:ea00 \
                    --new=1:: \
                    --attributes=1:set:2
             ;;
         amd64)
             sgdisk "${disk_image}" \
+                   --new=13::1G \
+                   --typecode=13:ea00 \
                    --new=14::+4M \
                    --new=15::+106M \
-                   --new=16::1G \
-                   --typecode=16:ea00 \
                    --new=1::
             sgdisk "${disk_image}" \
                    -t 14:ef02 \
@@ -71,7 +71,7 @@ create_partitions() {
 
 create_and_mount_boot_partitions() {
     uefi_dev="${loop_device}p15"
-    boot_dev="${loop_device}p16"
+    boot_dev="${loop_device}p13"
     mountpoint="$1"
 
     mkfs.vfat -F 32 -n UEFI "${uefi_dev}"

live-build/ubuntu-cpc/hooks.d/base/riscv64/initramfs-tools/allwinner

@@ -0,0 +1,3 @@
+# Required drivers to boot off MMC
+mmc-block
+sunxi-mmc