diff -Nru livecd-rootfs-2.668/debian/changelog livecd-rootfs-2.669/debian/changelog
--- livecd-rootfs-2.668/debian/changelog	2020-06-23 14:05:11.000000000 +0000
+++ livecd-rootfs-2.669/debian/changelog	2020-06-25 17:02:51.000000000 +0000
@@ -1,3 +1,9 @@
+livecd-rootfs (2.669) groovy; urgency=medium
+
+  * chroot: disable amd64 codepath on riscv64
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 25 Jun 2020 18:02:51 +0100
+
 livecd-rootfs (2.668) groovy; urgency=medium
 
   [ Łukasz 'sil2100' Zemczak ]
diff -Nru livecd-rootfs-2.668/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot livecd-rootfs-2.669/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
--- livecd-rootfs-2.668/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot	2020-03-30 16:46:08.000000000 +0000
+++ livecd-rootfs-2.669/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot	2020-06-25 17:02:51.000000000 +0000
@@ -116,8 +116,8 @@
 
 
 case $arch in
-	# ARM, ppc and s390 images are special
-	armhf|arm64|powerpc|ppc64el|s390x)
+	# ARM, ppc, riscv64 and s390x images are special
+	armhf|arm64|powerpc|ppc64el|s390x|riscv64)
 		exit 0
 		;;
 esac