releasing package livecd-rootfs version 24.04.76

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.

debian/changelog

@@ -1,9 +1,55 @@
-livecd-rootfs (24.04.70) UNRELEASED; urgency=medium
+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
 
@@ -284,18 +289,6 @@ 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

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:milkvmars|riscv64:nezha|riscv64:pic64gx|riscv64:unmatched|\
-	riscv64:visionfive2|\
+	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

@@ -778,6 +778,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/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/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-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
+# Run the unminimize script to re-install packages with all dpkg filters removed and install packages
-# /usr/sbin/lxd from the lxd-installer package.
+# removed as part of minimization
-# We can't do that at this stage so just neuter the lxd command (the snap
+yes | /usr/local/sbin/unminimize
-# 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
 
 # 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/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('--squashfs', default='')
-parser.add_argument('--translations', required=True)
+parser.add_argument('--translations')
-parser.add_argument('--template', required=True)
+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')):
+    if opts.translations:
-        with open(mo, 'rb') as fp:
+        for mo in glob.glob(os.path.join(opts.translations, '*.mo')):
-            t = gettext.GNUTranslations(fp=fp)
+            with open(mo, 'rb') as fp:
-        t_name = t.gettext(en_name)
+                t = gettext.GNUTranslations(fp=fp)
-        if t_name != en_name:
+            t_name = t.gettext(en_name)
-            lang = os.path.splitext(os.path.basename(mo))[0]
+            if t_name != en_name:
-            template['name'][lang] = t_name
+                lang = os.path.splitext(os.path.basename(mo))[0]
-        t_description = t.gettext(en_description)
+                template['name'][lang] = t_name
-        if t_description != en_description:
+            t_description = t.gettext(en_description)
-            lang = os.path.splitext(os.path.basedescription(mo))[0]
+            if t_description != en_description:
-            template['description'][lang] = t_description
+                lang = os.path.splitext(os.path.basedescription(mo))[0]
-        if opts.langs is not None:
+                template['description'][lang] = t_description
-            template['preinstalled_langs'] = opts.langs.split(',')
+            if opts.langs is not None:
+                template['preinstalled_langs'] = opts.langs.split(',')
 
     output.append(template)