add changelog entry

patch create_manifest to produce an sbom when called by an ubuntu-cpc
project. Patch all the ubuntu-cpc hooks and series files to include the
newly generated manifests, filelists, and sboms. Generates a number of
new artifacts in the builds. the snap utilized, cpc-sbom, is an open
source repo and a provided via a hidden snap. there is no intention of
publisizing the snap or how we generate sboms, however partners require
the ability to audit if required.

defensively checks if the snap is already installed, in the case of
multiple hooks being called in a single build (thus sharing a build
host), and only if called in an ubuntu-cpc project.

(cherry picked from commit 7c7b7df89dc96169db1f255d6bba901ebb63a43c)

debian/changelog

@@ -1,9 +1,75 @@
-livecd-rootfs (24.04.70) UNRELEASED; urgency=medium
+livecd-rootfs (24.04.78) noble; urgency=medium
 
+  * add cpc-sbom to create_manifest calls to generate sboms (LP: #2077105)
+
+ -- jchittum <john.chittum@canonical.com>  Mon, 26 Aug 2024 14:15:05 -0400
+
+livecd-rootfs (24.04.77.1) noble; 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
+
+livecd-rootfs (24.04.77) noble; urgency=medium
+
+  * Drop unminimize spit out by livecd-rootfs. (LP: #2077695)
+  * Use packaged unminimize in the ubuntu-server images.
+
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Wed, 21 Aug 2024 12:08:44 +0530
+
+livecd-rootfs (24.04.76) noble; urgency=medium
+
+  * Force latest/stable/ubuntu-24.10 subiquity onto the ubuntu-core-installer
+    ISO for now. (LP: #2077495)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 21 Aug 2024 16:13:58 +1200
+
+livecd-rootfs (24.04.75) noble; urgency=medium
+
+  * Add 'ubuntu-core-installer' project. (LP: #2076307)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 30 Jul 2024 16:35:31 +1200
+
+livecd-rootfs (24.04.74) noble; 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
+
+livecd-rootfs (24.04.73) noble; urgency=medium
+
+  * Build qcow2 images for ubuntu-core LXD support (LP: #2072759).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 11 Jul 2024 13:15:43 +0200
+
+livecd-rootfs (24.04.72) noble; urgency=medium
+
+  [ Heinrich Schuchardt ]
+  * riscv64: use earlycon=sbi on command line (LP: #2068739)
+
+  [ Philip Roche ]
+  * Revert removal of unminimize call in server builds (LP: #2069828)
+
+ -- Philip Roche <phil.roche@canonical.com>  Mon, 24 Jun 2024 14:24:52 +0100
+
+livecd-rootfs (24.04.71) noble; urgency=medium
+
+  * Re-enable ability to build HyperV desktop images (LP: #2064280)
+
+ -- Philip Roche <phil.roche@canonical.com>  Mon, 27 May 2024 12:05:33 +0100
+ 
+livecd-rootfs (24.04.70) noble; urgency=medium
+
+  [ Łukasz 'sil2100' Zemczak ]
   * Add experimental support for building ubuntu-core-desktop installer images
     (LP: #2063203)
 
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 24 Apr 2024 10:53:27 +0100
+  [ Philip Roche ]
+  * No longer install LXD snap in unminimize script (LP: #2066905) 
+
+ -- Philip Roche <phil.roche@canonical.com>  Fri, 24 May 2024 15:47:48 +0100
 
 livecd-rootfs (24.04.69) noble; urgency=medium
 

live-build/auto/build

@@ -37,6 +37,11 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ] \
 		#  we should be supporting more than one for models that
 		#  define those.
 		mv output/*.img "$PREFIX".img
+		# For standard, non-platform-specific core images, prepare a
+		# qcow2 image as well for LXD consumption.
+		if [ -z "${SUBARCH:-}" ]; then
+			convert_to_qcow2 "$PREFIX".img "$PREFIX".qcow2
+		fi
 		xz -0 -T4 "$PREFIX".img
 		mv output/seed.manifest "$PREFIX".manifest
 
@@ -180,128 +185,6 @@ EOF
 		# Remove docs installed by bootstrap
 		Chroot chroot dpkg-query -f '${binary:Package}\n' -W | Chroot chroot xargs -L1 apt-get install --reinstall
 
-                # Add unminimizer script which restores default image behavior
-                mkdir -p chroot/usr/local/sbin
-                cat > chroot/usr/local/sbin/unminimize <<'EOF'
-#!/bin/sh
-
-set -e
-
-echo "This system has been minimized by removing packages and content that are"
-echo "not required on a system that users do not log into."
-echo ""
-echo "This script restores content and packages that are found on a default"
-echo "Ubuntu server system in order to make this system more suitable for"
-echo "interactive use."
-echo ""
-echo "Reinstallation of packages may fail due to changes to the system"
-echo "configuration, the presence of third-party packages, or for other"
-echo "reasons."
-echo ""
-echo "This operation may take some time."
-echo ""
-read -p "Would you like to continue? [y/N] " REPLY
-echo    # (optional) move to a new line
-if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ]
-then
-    exit 1
-fi
-
-if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp ]; then
-    echo "Re-enabling installation of all documentation in dpkg..."
-    if [ -f /etc/dpkg/dpkg.cfg.d/excludes ]; then
-        mv /etc/dpkg/dpkg.cfg.d/excludes /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp
-    fi
-    echo "Updating package list and upgrading packages..."
-    apt-get update
-    # apt-get upgrade asks for confirmation before upgrading packages to let the user stop here
-    apt-get upgrade
-    echo "Restoring system documentation..."
-    echo "Reinstalling packages with files in /usr/share/man/ ..."
-    # Reinstallation takes place in two steps because a single dpkg --verified
-    # command generates very long parameter list for "xargs dpkg -S" and may go
-    # over ARG_MAX. Since many packages have man pages the second download
-    # handles a much smaller amount of packages.
-    dpkg -S /usr/share/man/ |sed 's|, |\n|g;s|: [^:]*$||' | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
-    echo "Reinstalling packages with system documentation in /usr/share/doc/ .."
-    # This step processes the packages which still have missing documentation
-    dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/doc/ {print $2}' | sed 's|/[^/]*$||' | sort | uniq \
-         | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
-    echo "Restoring system translations..."
-    # This step processes the packages which still have missing translations
-    dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/locale/ {print $2}' | sed 's|/[^/]*$||' | sort | uniq \
-         | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
-    if dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/doc/ {exit 1}'; then
-        echo "Documentation has been restored successfully."
-        rm /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp
-    else
-        echo "There are still files missing from /usr/share/doc/:"
-        dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/doc/ {print " " $2}'
-        echo "You may want to try running this script again or you can remove"
-        echo "/etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp and restore the files manually."
-    fi
-fi
-
-if  [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
-    # Remove diverted man binary
-    rm -f /usr/bin/man
-    dpkg-divert --quiet --remove --rename /usr/bin/man
-fi
-EOF
-
-                if [ "$PROJECT" != "ubuntu-base" ] && [ "$PROJECT" != "ubuntu-oci" ]; then
-                    	# ubuntu-minimal is too much for a docker container (it contains
-                    	# systemd and other things)
-	                cat >> chroot/usr/local/sbin/unminimize <<'EOF'
-
-if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then
-    echo "Installing ubuntu-minimal package to provide the familiar Ubuntu minimal system..."
-    DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal ubuntu-standard
-fi
-
-if dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-server 2> /dev/null | grep -q '^installed$' \
-   && ! dpkg-query --show --showformat='${db:Status-Status}\n' landscape-common 2> /dev/null | grep -q '^installed$'; then
-    echo "Installing ubuntu-server recommends..."
-    DEBIAN_FRONTEND=noninteractive apt-get install -y landscape-common
-fi
-EOF
-                fi
-
-                if [ "$PROJECT" = "ubuntu-cpc" ]; then
-                  # we'd like to transform a minimized image to a base image
-                  # when unminimize is run.
-                  cat >> chroot/usr/local/sbin/unminimize <<'EOF'
-
-# even if ubuntu-server is installed, we should re-install it with --fix-policy --install-recommends
-# to ensure all the Recommends of dependencies of ubuntu-server are installed, which aids in transforming
-# this minimized image to an equivalent base image.
-DEBIAN_FRONTEND=noninteractive apt-get --reinstall --fix-policy --install-recommends install -y ubuntu-server
-
-if dpkg-query --show --showformat='${db:Status-Status}\n' linux-image-virtual 2> /dev/null | grep -q '^installed$'; then
-    echo "Installing linux-virtual for installing the headers which were stripped in a minimized image"
-    DEBIAN_FRONTEND=noninteractive apt-get install -y linux-virtual
-fi
-EOF
-
-fi
-		if [ "$PROJECT" = "ubuntu-cpc" ] || [ "$PROJECT" = "ubuntu-server" ]; then
-			cat >> chroot/usr/local/sbin/unminimize <<'EOF'
-
-# installing LXD using the lxd-installer by simply invoking it
-echo "Invoking LXD so that it can be installed by the lxd-installer's script.."
-lxd --version
-
-echo "Removing lxd installer package..."
-apt-get purge -y lxd-installer
-
-EOF
-		fi
-		cat >> chroot/usr/local/sbin/unminimize <<'EOF'
-
-# unminimization succeeded, there is no need to mention it in motd
-rm -f /etc/update-motd.d/60-unminimize
-EOF
-                chmod +x chroot/usr/local/sbin/unminimize
 
 		# inform users about the unminimize script
 		cat > "chroot/etc/update-motd.d/60-unminimize" << EOF

live-build/auto/config

@@ -9,8 +9,8 @@ case $ARCH:$SUBARCH in
 	i386:|\
 	ppc64el:|\
 	riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\
-	riscv64:milkvmars|riscv64:nezha|riscv64:unmatched|riscv64:visionfive|\
-	riscv64:visionfive2|\
+	riscv64:milkvmars|riscv64:nezha|riscv64:pic64gx|riscv64:unmatched|\
+	riscv64:visionfive|riscv64:visionfive2|\
 	s390x:|\
 	*appliance*)
 		;;
@@ -382,7 +382,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
 					;;
 			esac
 			;;
-		ubuntu-server:live|ubuntu-mini-iso:)
+		ubuntu-server:live|ubuntu-mini-iso:|ubuntu-core-installer:)
 			IMAGEFORMAT=plain
 			;;
 	esac
@@ -396,6 +396,7 @@ if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
 		riscv64:licheerv | \
 		riscv64:milkvmars | \
 		riscv64:nezha | \
+		riscv64:pic64gx | \
 		riscv64:unmatched | \
 		riscv64:visionfive | \
 		riscv64:visionfive2 | \
@@ -421,7 +422,7 @@ case $IMAGEFORMAT in
 		;;
 	plain)
 		case $PROJECT:${SUBPROJECT:-} in
-			ubuntu-server:live)
+			ubuntu-server:live|ubuntu-core-installer:)
 	                        touch config/universe-enabled
 				;;
 			ubuntu-mini-iso:)
@@ -1046,6 +1047,22 @@ case $PROJECT in
 		PREINSTALL_POOL_SEEDS='server-ship'
 		;;
 
+	ubuntu-core-installer)
+	    # The ubuntu-core-installer image is an installer that installs ubuntu
+	    # core. The environment the installer runs in is similar to the server
+	    # 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.
+	    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
+
+	    /usr/share/livecd-rootfs/checkout-translations-branch \
+		https://git.launchpad.net/subiquity po config/catalog-translations
+	    ;;
+
 	ubuntu-mini-iso)
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 
@@ -1241,7 +1258,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
 esac
 
 case $PROJECT:${SUBPROJECT:-} in
-	ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*)
+	ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu-core-installer:*)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
@@ -1438,7 +1455,7 @@ 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:*| \
-	        ubuntukylin:*|ubuntu-mate:*|ubuntu-core-desktop:*)
+	        ubuntukylin:*|ubuntu-mate:*|ubuntu-core-desktop:*|ubuntu-core-installer:*)
 		# 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

live-build/functions

@@ -39,6 +39,10 @@ create_empty_disk_image() {
 create_manifest() {
     local chroot_root=${1}
     local target_file=${2}
+    local base_default_sbom_name="ubuntu-cloud-image-$(grep "VERSION_ID" $chroot_root/etc/os-release | cut --delimiter "=" --field 2 | tr -d '"')-${ARCH}-$(date +%Y%m%dT%H:%M:%S)"
+    local sbom_file_name=${3:-"${base_default_sbom_name}.spdx"}
+    local sbom_document_name=${4:-"${base_default_sbom_name}"}
+    local sbom_log=${sbom_document_name}.log
     echo "create_manifest chroot_root: ${chroot_root}"
     dpkg-query --show --admindir="${chroot_root}/var/lib/dpkg" > ${target_file}
     echo "create_manifest call to dpkg-query finished."
@@ -48,6 +52,22 @@ create_manifest() {
         echo "create_manifest creating file listing."
         local target_filelist=${2%.manifest}.filelist
         (cd "${chroot_root}" && find -xdev) | sort > "${target_filelist}"
+        # only creating sboms for CPC project at this time
+        if [[ ! $(which cpc-sbom) ]]; then
+            # ensure the tool is installed
+            sudo snap install --classic --edge cpc-sbom
+        fi
+        # generate the SBOM
+        cpc-sbom --rootdir ${chroot_root} --ignore-copyright-parsing-errors --ignore-copyright-file-not-found-errors --document-name ${sbom_document_name} >"${sbom_file_name}" 2>"${sbom_log}"
+        SBOM_GENERATION_EXIT_CODE=$?
+        if [[ ${SBOM_GENERATION_EXIT_CODE} !=  "0" ]]; then
+        # check for failure and print log
+            echo "ERROR: SBOM generation failed. See ${sbom_log}"
+            cat "$sbom_log"
+            exit 1
+        else
+            echo "SBOM generation succeeded. see ${sbom_log} for details"
+        fi    
     fi
     echo "create_manifest finished"
 }
@@ -778,6 +798,12 @@ 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.

live-build/ubuntu-core-installer/hooks/01-setup_modules.chroot

@@ -0,0 +1,5 @@
+#!/bin/sh -x
+
+set -e
+
+mkdir -p /lib/modules

live-build/ubuntu-core-installer/hooks/02-installer-bits.chroot

@@ -0,0 +1,17 @@
+#!/bin/bash -ex
+# vi: ts=4 noexpandtab
+
+if [ "${PASS}" != "base.live" ]; then
+    exit 0
+fi
+
+# Make sure NoCloud is last
+values=$(echo get cloud-init/datasources | debconf-communicate | sed 's/^0 //;s/NoCloud, //;s/None/NoCloud, None/')
+printf "%s\t%s\t%s\t%s\n" \
+   cloud-init cloud-init/datasources multiselect  "$values" | debconf-set-selections
+dpkg-reconfigure --frontend=noninteractive cloud-init
+
+if [ `dpkg --print-architecture` = s390x ]; then
+    # because z/VM x3270 is just ttyS0
+    cp -r /usr/lib/systemd/system/serial-getty@sclp_line0.service.d /usr/lib/systemd/system/serial-getty@ttyS0.service.d
+fi

live-build/ubuntu-core-installer/hooks/03-kernel-metapkg.chroot_early

@@ -0,0 +1,19 @@
+#!/bin/bash -ex
+# vi: ts=4 noexpandtab
+
+case $PASS in
+    base.live)
+        ;;
+    *)
+        exit 0
+        ;;
+esac
+
+
+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-installer/hooks/04-kernel-bits.binary

@@ -0,0 +1,17 @@
+#!/bin/bash -eux
+# vi: ts=4 noexpandtab
+
+case $PASS in
+    base.live)
+        ;;
+    *)
+        exit 0
+        ;;
+esac
+
+PROJECT=$PROJECT${SUBARCH:+-$SUBARCH}
+
+# Fish out generated kernel image and initrd
+mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic
+mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic
+chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic

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

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -eux
+
+case ${PASS:-} in
+    base.live)
+        ;;
+    *)
+        exit 0
+        ;;
+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
+
+env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
+    config/ubuntu-core-24-amd64.model --snap console-conf chroot
+mv chroot/system-seed/systems/* chroot/system-seed/systems/ubuntu-core-24-amd64
+rsync -av chroot/system-seed/{systems,snaps} chroot/var/lib/snapd/seed
+rm -rf chroot/system-seed
+
+cat <<-EOF > config/edge.catalog-in.yaml
+name: "Ubuntu Core 24"
+description: >-
+  Ubuntu Core.
+id: ubuntu-core
+type: null
+variant: core
+locale_support: none
+snapd_system_label: ubuntu-core-24-amd64
+EOF
+PROJECT_FULL=$PROJECT${SUBARCH:+-$SUBARCH}
+usc_opts="--output livecd.${PROJECT_FULL}.install-sources.yaml \
+	  --template config/edge.catalog-in.yaml \
+	  --size 0"
+/usr/share/livecd-rootfs/update-source-catalog $usc_opts

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

@@ -0,0 +1,117 @@
+# 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-installer/includes.chroot.base.live/etc/cloud/cloud.cfg.d/06_quiet.cfg

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

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

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

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

@@ -0,0 +1,4 @@
+# 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-installer/includes.chroot.base.live/etc/systemd/system/systemd-journald.service.d/no-hardening.conf

@@ -0,0 +1,4 @@
+# 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-installer/includes.chroot.base.live/usr/bin/subiquity-shell

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

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

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

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

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

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

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

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

@@ -0,0 +1,8 @@
+[Unit]
+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/serial-getty@sclp_line0.service.d/subiquity-serial.conf

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

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

@@ -0,0 +1,13 @@
+[Unit]
+IgnoreOnIsolate=yes
+
+[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-installer/includes.chroot.base.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf

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

live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/systemd-networkd-wait-online

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

live-build/ubuntu-core-installer/includes.chroot.base/etc/systemd/system/multi-user.target.wants/systemd-networkd.service

@@ -0,0 +1 @@
+/lib/systemd/system/systemd-networkd.service

live-build/ubuntu-core-installer/includes.chroot.base/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service

@@ -0,0 +1 @@
+/lib/systemd/system/systemd-networkd-wait-online.service

live-build/ubuntu-core-installer/includes.chroot.base/etc/systemd/system/sockets.target.wants/systemd-networkd.socket

@@ -0,0 +1 @@
+/lib/systemd/system/systemd-networkd.socket

live-build/ubuntu-cpc/hooks.d/base/create-root-dir.binary

@@ -24,6 +24,6 @@ rm -rf $rootfs_dir/boot/grub
 # Keep this as some derivatives mount a tempfs here
 mkdir -p $rootfs_dir/lib/modules
 
-teardown_mountpoint $rootfs_dir
+create_manifest $rootfs_dir "livecd.ubuntu-cpc.rootfs.manifest" "livecd.ubuntu-cpc.rootfs.spdx"  "cloud-image-rootfs-$ARCH-$(date +%Y%m%dT%H:%M:%S)"
 
-create_manifest "${rootfs_dir}" "${rootfs_dir}.manifest"
+teardown_mountpoint $rootfs_dir

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

@@ -80,6 +80,8 @@ cp -a chroot/* mountpoint/
 chroot mountpoint dpkg-query -W > binary/boot/filesystem.packages
 (cd mountpoint && find -xdev) | sort > binary/boot/filesystem.filelist
 
+create_manifest  "mountpoint/" "$PWD/livecd.ubuntu-cpc.disk-image.manifest" "$PWD/livecd.ubuntu-cpc.disk-image.spdx"  "cloud-image-$ARCH-$(date +Y%m%dT%H:%M:%S)"
+
 umount mountpoint
 rmdir mountpoint
 

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

@@ -9,21 +9,6 @@ case $ARCH in
         ;;
 esac
 
-case ${PROJECT:-}:${SUBPROJECT:-} in
-    ubuntu:)
-        echo "We don't create EFI images for Ubuntu Desktop."
-        exit 0
-        ;;
-    ubuntu)
-        IMAGE_STR="# DESKTOP_IMG: This file was created/modified by the Desktop Image build process"
-        FS_LABEL="desktop-rootfs"
-        IMAGE_SIZE=12884901888 # 12G
-        ;;
-    *)
-        IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
-        FS_LABEL="cloudimg-rootfs"
-        ;;
-esac
 
 if [ "$ARCH" = "amd64" ]; then
     IMAGE_SIZE=3758096384 # bump to 3.5G (3584*1024**2); Since Kinetic amd64 need more then the default 2.2G
@@ -44,6 +29,22 @@ if [ "$ARCH" = "riscv64" ]; then
     IMAGE_SIZE=4831838208 # bump to 4.5G (4608*1024**2); initrd creation fails with "No space left" with 3.5G
 fi
 
+case ${PROJECT:-}:${SUBPROJECT:-} in
+    ubuntu:)
+        echo "We don't create EFI images for Ubuntu Desktop."
+        exit 0
+        ;;
+    ubuntu:desktop-preinstalled)
+        IMAGE_STR="# DESKTOP_IMG: This file was created/modified by the Desktop Image build process"
+        FS_LABEL="desktop-rootfs"
+        IMAGE_SIZE=12884901888 # 12G
+        ;;
+    *)
+        IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
+        FS_LABEL="cloudimg-rootfs"
+        ;;
+esac
+
 . config/binary
 
 . config/functions
@@ -104,7 +105,7 @@ create_partitions() {
                        --change-name=12:CIDATA \
                        --new=1:: \
                        --attributes=1:set:2
-            elif [ "${SUBARCH:-}" = "icicle" ]; then
+            elif [ "${SUBARCH:-}" = "icicle" ] || [ "${SUBARCH:-}" = "pic64gx" ]; then
                 # Microchip Icicle Kit
                 sgdisk "${disk_image}" \
                        --set-alignment=2 \
@@ -327,6 +328,17 @@ install_grub() {
                         loader1="${loop_device}p13"
                         dd if=mountpoint/usr/lib/u-boot/${SUBARCH}/u-boot-sunxi-with-spl.bin of=$loader1
                         ;;
+                    "pic64gx")
+                        cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
+                        # flash-kernel is needed to install the dtb for update-grub: it uses the
+                        # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
+                        # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
+                        chroot mountpoint bash -c "echo 'Microchip PIC64GX Curiosity Kit' > /etc/flash-kernel/machine"
+                        # u-boot-pic64gx contains the vendor U-Boot
+                        chroot mountpoint apt-get install -qqy u-boot-pic64gx
+                        loader="${loop_device}p13"
+                        dd if=mountpoint/usr/lib/u-boot-pic64gx/u-boot.payload of=$loader
+                        ;;
                     "visionfive")
                         # flash-kernel is needed to install the dtb for update-grub: it uses the
                         # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,

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

@@ -184,7 +184,8 @@ install_grub() {
     mount
 
     # create sorted filelist as the very last step before unmounting
-    (cd mountpoint && find -xdev) | sort > binary/boot/filesystem.filelist
+    # explicitly generate manifest and sbom
+    create_manifest  "mountpoint/" "$PWD/livecd.ubuntu-cpc.disk-uefi.manifest" "$PWD/livecd.ubuntu-cpc.disk-uefi.spdx"  "cloud-image-$ARCH-$(date +%Y%m%dT%H:%M:%S)"
 
     umount_partition mountpoint
     rmdir mountpoint
@@ -201,6 +202,7 @@ make_ext4_partition "${rootfs_dev_mapper}"
 mkdir mountpoint
 mount "${rootfs_dev_mapper}" mountpoint
 cp -a chroot/* mountpoint/
+
 umount mountpoint
 rmdir mountpoint
 

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

@@ -158,6 +158,8 @@ EOF
         $ZIPL_EXTRA_PARAMS
 fi
 
+create_manifest  "mountpoint/" "$PWD/livecd.ubuntu-cpc.disk-image.manifest" "$PWD/livecd.ubuntu-cpc.disk-image.spdx"  "cloud-image-$ARCH-$(date +%Y%m%dT%H:%M:%S)"
+
 if [ -n "$BOOT_MOUNTPOINT" ]; then
 	umount "mountpoint/$BOOT_MOUNTPOINT"
 fi

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

@@ -2,8 +2,17 @@
 
 . config/functions
 
+qcow_file=${PWD}/livecd.ubuntu-cpc.qcow
 if [ -f binary/boot/disk-uefi.ext4 ]; then
     convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.img
+    uefi_file="livecd.ubuntu-cpc.disk-uefi"
+    cp ${uefi_file}.manifest ${qcow_file}.manifest
+    cp ${uefi_file}.filelist ${qcow_file}.filelist
+    cp ${uefi_file}.spdx ${qcow_file}.spdx
 elif [ -f binary/boot/disk.ext4 ]; then
     convert_to_qcow2 binary/boot/disk.ext4 livecd.ubuntu-cpc.img
+    disk_file="livecd.ubuntu-cpc.disk-image"
+    cp ${disk_file}.manifest ${qcow_file}.manifest
+    cp ${disk_file}.filelist ${qcow_file}.filelist
+    cp ${disk_file}.spdx ${qcow_file}.spdx
 fi

live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg

@@ -1,4 +1,4 @@
 # Booting on many riscv64 systems is slow. Let the user view progress.
 # For minimum output use
 # GRUB_CMDLINE_LINUX_DEFAULT="quiet"
-GRUB_CMDLINE_LINUX_DEFAULT="efi=debug earlycon"
+GRUB_CMDLINE_LINUX_DEFAULT="efi=debug earlycon=sbi"

live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf

@@ -1 +1 @@
-U_BOOT_PARAMETERS="ro efi=debug earlycon"
+U_BOOT_PARAMETERS="ro efi=debug earlycon=sbi"

live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary

@@ -15,8 +15,11 @@ rootfs_dir=rootfs.dir
 
 squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs"
 
-cp $rootfs_dir.manifest $squashfs_f.manifest
+cp livecd.ubuntu-cpc.rootfs.manifest ${squashfs_f}.manifest
+cp livecd.ubuntu-cpc.rootfs.filelist ${squashfs_f}.filelist
+cp livecd.ubuntu-cpc.rootfs.spdx ${squashfs_f}.spdx
+
 # fstab is omitted from the squashfs
-grep -v '^/etc/fstab$' $rootfs_dir.filelist >$squashfs_f.filelist
+grep -v '^/etc/fstab$' livecd.ubuntu-cpc.rootfs.filelist >$squashfs_f.filelist
 
 create_squashfs $rootfs_dir $squashfs_f

live-build/ubuntu-cpc/hooks.d/base/root-xz.binary

@@ -11,6 +11,4 @@ fi
 # This is the directory created by create-root-dir.binary
 rootfs_dir=rootfs.dir
 
-cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest
-cp $rootfs_dir.filelist livecd.ubuntu-cpc.rootfs.filelist
 (cd $rootfs_dir/ && tar -c --sort=name --xattrs *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz

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

@@ -6,3 +6,6 @@ provides livecd.ubuntu-cpc.initrd-generic
 provides livecd.ubuntu-cpc.kernel-generic
 provides livecd.ubuntu-cpc.manifest
 provides livecd.ubuntu-cpc.filelist
+provides livecd.ubuntu-cpc.disk-image.manifest
+provides livecd.ubuntu-cpc.disk-image.filelist
+provides livecd.ubuntu-cpc.disk-image.spdx

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

@@ -4,3 +4,6 @@ provides livecd.ubuntu-cpc.initrd-generic
 provides livecd.ubuntu-cpc.kernel-generic
 provides livecd.ubuntu-cpc.manifest
 provides livecd.ubuntu-cpc.filelist
+provides livecd.ubuntu-cpc.disk-uefi.manifest
+provides livecd.ubuntu-cpc.disk-uefi.filelist
+provides livecd.ubuntu-cpc.disk-uefi.spdx

live-build/ubuntu-cpc/hooks.d/base/series/qcow2

@@ -1,3 +1,6 @@
 depends disk-image
 base/qcow2-image.binary
 provides livecd.ubuntu-cpc.img
+provides livecd.ubuntu-cpc.qcow.manifest
+provides livecd.ubuntu-cpc.qcow.filelist
+provides livecd.ubuntu-cpc.qcow.spdx

live-build/ubuntu-cpc/hooks.d/base/series/squashfs

@@ -3,3 +3,4 @@ base/root-squashfs.binary
 provides livecd.ubuntu-cpc.squashfs
 provides livecd.ubuntu-cpc.squashfs.manifest
 provides livecd.ubuntu-cpc.squashfs.filelist
+provides livecd.ubuntu-cpc.squashfs.spdx

live-build/ubuntu-cpc/hooks.d/base/series/tarball

@@ -3,3 +3,4 @@ base/root-xz.binary
 provides livecd.ubuntu-cpc.rootfs.tar.xz
 provides livecd.ubuntu-cpc.rootfs.manifest
 provides livecd.ubuntu-cpc.rootfs.filelist
+provides livecd.ubuntu-cpc.rootfs.spdx

live-build/ubuntu-cpc/hooks.d/base/series/vagrant

@@ -1,3 +1,6 @@
 depends disk-image
 base/vagrant.binary
 provides livecd.ubuntu-cpc.vagrant.box
+provides livecd.ubuntu-cpc.vagrant.manifest
+provides livecd.ubuntu-cpc.vagrant.filelist
+provides livecd.ubuntu-cpc.vagrant.spdx

live-build/ubuntu-cpc/hooks.d/base/series/vmdk

@@ -3,3 +3,6 @@ base/vmdk-image.binary
 base/vmdk-ova-image.binary
 provides livecd.ubuntu-cpc.vmdk
 provides livecd.ubuntu-cpc.ova
+provides livecd.ubuntu-cpc.vmdk.manifest
+provides livecd.ubuntu-cpc.vmdk.filelist
+provides livecd.ubuntu-cpc.vmdk.spdx

live-build/ubuntu-cpc/hooks.d/base/vagrant.binary

@@ -93,6 +93,8 @@ EOF
 chroot ${mount_d} chown -R vagrant:vagrant /home/vagrant/.ssh
 chroot ${mount_d} chmod 700 /home/vagrant/.ssh
 
+create_manifest $mount_d "livecd.ubuntu-cpc.vagrant.manifest" "livecd.ubuntu-cpc.vagrant.spdx"  "cloud-image-vagrant-$ARCH-$(date +%Y%m%dT%H:%M:%S)"
+
 umount_disk_image "$mount_d"
 rmdir "$mount_d"
 

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

@@ -20,8 +20,18 @@ esac
 
 . config/functions
 
+vmdk_file="$PWD/livecd.ubuntu-cpc.vmdk"
+
 if [ -e binary/boot/disk-uefi.ext4 ]; then
     create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.vmdk
+    uefi_file="livecd.ubuntu-cpc.disk-uefi"
+    cp ${uefi_file}.manifest ${vmdk_file}.manifest
+    cp ${uefi_file}.filelist ${vmdk_file}.filelist
+    cp ${uefi_file}.spdx ${vmdk_file}.spdx
 elif [ -f binary/boot/disk.ext4 ]; then
     create_vmdk binary/boot/disk.ext4 livecd.ubuntu-cpc.vmdk
+    disk_file="livecd.ubuntu-cpc.disk-image"
+    cp ${disk_file}.manifest ${vmdk_file}.manifest
+    cp ${disk_file}.filelist ${vmdk_file}.filelist
+    cp ${disk_file}.spdx ${vmdk_file}.spdx
 fi

live-build/ubuntu-server/hooks/01-unminimize.chroot_early

@@ -10,30 +10,9 @@ case ${PASS} in
         ;;
 esac
 
-# The unminimize script will try to install the lxd snap using the shim script
-# /usr/sbin/lxd from the lxd-installer package.
-# We can't do that at this stage so just neuter the lxd command (the snap
-# will get properly seeded by generic machinery).
-if [ -f "/usr/sbin/lxd" ]; then
-    dpkg-divert --add --divert /usr/sbin/lxd.REAL --rename /usr/sbin/lxd
-    ln -s /bin/true /usr/sbin/lxd
-    yes | /usr/local/sbin/unminimize
-    # unminimize also uninstalls lxd-installer package
-    # and also removed `/usr/sbin/lxd` as a result, so we don't need to restore, but
-    # we do need to remove the mock we used as part of dpkg-divert
-    # first we need to remove the diversion
-    dpkg-divert --remove --no-rename /usr/sbin/lxd
-    # now remove the renamed file that we originally diverted to
-    rm -v /usr/sbin/lxd.REAL
-else
-    # if /usr/sbin/lxd doesn't exist then lxd-installer package isn't installed.
-    # Instead, we can mock the command to avoid the unminimize script failing
-    ln -s /bin/true /usr/sbin/lxd
-    yes | /usr/local/sbin/unminimize
-    # as the lxd-installer package was not installed and thus not removed by `unminimize`
-    # the mock /usr/sbin/lxd will still be present, so we need to remove it
-    rm -v /usr/sbin/lxd
-fi
+# Run the unminimize script to re-install packages with all dpkg filters removed and install packages
+# removed as part of minimization
+yes | /usr/bin/unminimize
 
 # Fix up missing recommends.  Other non-layered flavors handle this in
 # live-build/auto/build, but we need to do it here.  Also, there are

live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary

@@ -24,7 +24,7 @@ fi
 cat <<EOF > config/classic-model.model
 type: model
 authority-id: canonical
-revision: 2
+revision: 3
 series: 16
 brand-id: canonical
 model: ubuntu-classic-2404-amd64
@@ -75,7 +75,7 @@ snaps:
     name: gtk-common-themes
     type: app
   -
-    default-channel: latest/stable/ubuntu-24.04
+    default-channel: 2/stable/ubuntu-24.04
     id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
     name: snap-store
     type: app
@@ -85,23 +85,23 @@ snaps:
     name: snapd-desktop-integration
     type: app
   -
-    default-channel: latest/stable/ubuntu-24.04
+    default-channel: 1/stable/ubuntu-24.04
     id: EI0D1KHjP8XiwMZKqSjuh6W8zvcowUVP
     name: firmware-updater
     type: app
-timestamp: 2024-04-21T12:00:00.0Z
+timestamp: 2024-08-26T12:00:00.0Z
 sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
 
-AcLBXAQAAQoABgUCZiZYsgAKCRDgT5vottzAEir/EACXgxl3zMAplZZDP33gyk7dENrDD3VaindS
-sL91VFtNzrDQiK0ovuPUTuxg4N0XqDcGxIxBQUDggHA36n4+B+EP68Uu4kTS8PzJAeVfK2NzpleL
-1tgXjGCvb2JmRZIZozJ8x3DVIMeBByPcEKv+nULhnAcOIpZfBvbv/fs/pF5QKqsWQIlMPk23X5aF
-ZmcaOAT8S+d73i/SWJxAEjcS9SeKf+iHxDQ6niuOhGgM20+hvCiWT0YLefG9fYsu5FjNaT0o9p0Y
-hbYKb0SaILWrXrip209yciweVgUfRBDqYMnGWVojjW+dpS/IqLYvFL0y0hm5gQI4QmALXY+9p3Qc
-97YCbPsj0rOSGcPDUkLKu+vkVdIkIsYg44QMtJEhGs9dBBj5nt7welli5sjuQBUzRECWOlH1dJgd
-7PJi9Hl/6X3/CNUruK5t342B70BJ1IWp49dIKf9zfSvoJzDiBlRx6pl6/F54XU4Xef4Nl7+2Cc7z
-45FpV16tft9KhufXKksvTIaHDEWY5E4fbAL4YjCEf5TD2JZDI16cc8lrrGKO1R+hWjA943JgK1Ac
-kio/LUlP0oYPq9hxzdRQq4vynRt+MYro+/0yNzaX3IBODQ+7uX3KIakbaI6y/d6nCz8Z94PoJC2/
-9OnsJlX1QIsavtl5ct0Buqzk8AdLFwCHGM8xlT81Jw==
+AcLBXAQAAQoABgUCZsyysAAKCRDgT5vottzAEilHEACwNTjGEIAfePAkgYeaWvNvQXTIHRqa/fc8
+G7BJZQJjvE8I7DMQn5QHqUHpLTvyKQCch780R43NbNmcEWBSvYe7vdfSGwF4acyP6MBk7rO1s366
+lBjvKEkhk1yfcpx3cGUy+LWsLvJkRYvAC31vMCcVnyXZGzAFT0qDlHOH5J3UHc7JBmuo9rdHueKN
+KmjgozFp6NAPFFGEA4yqIqBRUtZyu9r27SvI2AqY+TKZClzUvaxxUOpCMTZmF8nMC9ucLRstSHbf
+BGUvaIo97xY0ycG8QHFXEG1iOsIhUq2pGgIIajCxL+A1uwvGuGRDHscb0g63MvfqJB3lIsKy/oTU
+8KgAIOG2Qy9AhwkP1kMuBh5Txw4XMp4lNmPpBToOIQK+LAmDup82+czcvTdDRVAmzq3gGMeSwzc8
+hwq6uMLbI+jl67tHhhItOAMF5UzqWetecA81OEvyLxNSYcLIJ2zbXwRaOTummnIFgg6RDPBwd0tl
+K8EVLVIakCQtKs/2tmBMWXuv2HStqoUsn+8I5ofzVv/gJnu0cD1xvLTJ0xbK4TnTmCYDP8b357Jg
+MXOLyKFuNLcaf1mR7vwsE3570jsFUQtwq8CYWZD5WCCVv1QXb2MKD3A1fEgAHMqRfHSa+HoPzsWY
++KDM/aLgtd0I8R7pQdz1GO2vkxz5BAv7jG5kvwhuYg==
 EOF
 
 channel=""

live-build/ubuntu/hooks/040-hyperv-desktop-images.binary

@@ -39,8 +39,14 @@ trap cleanup_hyperv EXIT
 
 # Perform customisations
 
+# For Ubuntu 24.04 and later cloud-init is included in desktop images. This is not applicable for Hyperv images so
+# we can disable cloud-init. This leaves the cloud-init package installed but disabled so users can still
+# use it if they want.
+touch "${scratch_d}/etc/cloud/cloud-init.disabled"
+
+
 chroot "${scratch_d}" apt-get update -y
-chroot "${scratch_d}" apt-get -y install xrdp linux-azure linux-tools-azure linux-cloud-tools-azure
+chroot "${scratch_d}" apt-get -y install xrdp linux-azure linux-tools-azure linux-cloud-tools-azure polkitd-pkla oem-config-gtk language-pack-en-base oem-config-slideshow-ubuntu
 
 cat > ${scratch_d}/etc/modules-load.d/hyperv.conf << EOF
 ${IMAGE_STR}
@@ -124,20 +130,19 @@ touch "${scratch_d}/var/lib/oem-config/run"
 
 chroot "${scratch_d}" apt-get clean
 
+raw_img=binary/boot/disk-hyperv-uefi.ext4
+vhd_img=livecd.ubuntu-desktop-hyperv.vhdx
+
+create_manifest "${scratch_d}" "$vhd_img.zip.manifest"
 # End customisations
 
 cleanup_hyperv
 trap - EXIT
 
-raw_img=binary/boot/disk-hyperv-uefi.ext4
-vhd_img=livecd.ubuntu-desktop-hyperv.vhdx
-
 qemu-img convert -O vhdx "$raw_img" "$vhd_img"
 rm "$raw_img"
 
 apt-get install -y zip
 
-create_manifest chroot "$vhd_img.zip.manifest"
-
 zip "$vhd_img.zip" "$vhd_img"
 rm "$vhd_img"

update-source-catalog

@@ -10,9 +10,9 @@ import yaml
 parser = argparse.ArgumentParser()
 parser.add_argument('--output', required=True)
 parser.add_argument('--size', required=True)
-parser.add_argument('--squashfs', required=True)
-parser.add_argument('--translations', required=True)
-parser.add_argument('--template', required=True)
+parser.add_argument('--squashfs', default='')
+parser.add_argument('--translations')
+parser.add_argument('--template')
 parser.add_argument('--langs', default=None)
 
 opts = parser.parse_args(sys.argv[1:])
@@ -58,19 +58,20 @@ else:
     template['name'] = {'en': en_name}
     template['description'] = {'en': en_description}
 
-    for mo in glob.glob(os.path.join(opts.translations, '*.mo')):
-        with open(mo, 'rb') as fp:
-            t = gettext.GNUTranslations(fp=fp)
-        t_name = t.gettext(en_name)
-        if t_name != en_name:
-            lang = os.path.splitext(os.path.basename(mo))[0]
-            template['name'][lang] = t_name
-        t_description = t.gettext(en_description)
-        if t_description != en_description:
-            lang = os.path.splitext(os.path.basedescription(mo))[0]
-            template['description'][lang] = t_description
-        if opts.langs is not None:
-            template['preinstalled_langs'] = opts.langs.split(',')
+    if opts.translations:
+        for mo in glob.glob(os.path.join(opts.translations, '*.mo')):
+            with open(mo, 'rb') as fp:
+                t = gettext.GNUTranslations(fp=fp)
+            t_name = t.gettext(en_name)
+            if t_name != en_name:
+                lang = os.path.splitext(os.path.basename(mo))[0]
+                template['name'][lang] = t_name
+            t_description = t.gettext(en_description)
+            if t_description != en_description:
+                lang = os.path.splitext(os.path.basedescription(mo))[0]
+                template['description'][lang] = t_description
+            if opts.langs is not None:
+                template['preinstalled_langs'] = opts.langs.split(',')
 
     output.append(template)