Merge branch 'more-iso-fixes' into ubuntu/master

debian/changelog

@@ -1,10 +1,16 @@
 livecd-rootfs (26.04.22) UNRELEASED; urgency=medium
 
+  [ Oliver Gayot ]
   * Pull the model from Launchpad's lp:canonical-models
     repo, instead of having it uploaded as part of livecd-rootfs. This
     indirection makes it possible to update the models without requiring a new
     upload of livecd-rootfs every time.
 
+  [ Michael Hudson-Doyle ]
+  * Fix two more problems with livefs-built ISOs:
+    - Generate the for-iso squashfs in the right place for Kubuntu.
+    - Fix confusion about the kernel path on the ISO on riscv64.
+
  -- Olivier Gayot <olivier.gayot@canonical.com>  Tue, 24 Feb 2026 16:22:51 +0100
 
 livecd-rootfs (26.04.21) resolute; urgency=medium

live-build/auto/build

@@ -576,7 +576,7 @@ if [ "${MAKE_ISO}" = "yes" ]; then
 	# create a for-iso.filesystem.squashfs that does.
 	if [ -z "$PASSES" ]; then
 		isobuild generate-sources --mountpoint=/cdrom > chroot/etc/apt/sources.list.d/cdrom.sources
-		create_squashfs chroot for-iso.filesystem.squashfs
+		create_squashfs chroot ${PWD}/for-iso.filesystem.squashfs
 	fi
 	# Link kernel and initrd files. The ${thing#${PREFIX}} expansion strips
 	# the PREFIX, so "livecd.ubuntu-server.kernel-generic" becomes

live-build/isobuilder/builder.py

@@ -268,7 +268,7 @@ class ISOBuilder:
             target.hardlink_to(src)
 
         kernel_name = "vmlinuz"
-        if self.arch == "ppc64el":
+        if self.arch in ("ppc64el", "riscv64"):
             kernel_name = "vmlinux"
 
         with self.logger.logged(