diff -Nru livecd-rootfs-23.10.56/debian/changelog livecd-rootfs-23.10.57/debian/changelog --- livecd-rootfs-23.10.56/debian/changelog 2023-10-11 10:41:00.000000000 +0000 +++ livecd-rootfs-23.10.57/debian/changelog 2023-12-06 19:30:35.000000000 +0000 @@ -1,3 +1,10 @@ +livecd-rootfs (23.10.57) mantic; urgency=medium + + [ Heinrich Schuchardt ] + * arm: fix console parameter for ARM cloud-images (LP: #2036730) + + -- Brian Murray Wed, 06 Dec 2023 11:30:35 -0800 + livecd-rootfs (23.10.56) mantic; urgency=medium * Enable snap preseeding with ppc64el images where /boot/vmlinux is used diff -Nru livecd-rootfs-23.10.56/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot livecd-rootfs-23.10.57/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot --- livecd-rootfs-23.10.56/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot 2023-10-11 10:41:00.000000000 +0000 +++ livecd-rootfs-23.10.57/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot 2023-12-06 19:29:49.000000000 +0000 @@ -170,6 +170,16 @@ psuedo_grub_probe > "${gprobe}" chmod 755 "${gprobe}" +case $arch in + armhf|arm64) + # QEMU virt machine provides AMBA PrimeCell UART + serial_console='ttyAMA0' + ;; + *) + serial_console='ttyS0' + ;; +esac + # for Quantal and later, use /etc/default/grub.d functionality # rather than modifying the grub configuration itself. # This avoids the mess of having to do dpkg stuff @@ -186,7 +196,7 @@ GRUB_TIMEOUT=0 # Set the default commandline -GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0" +GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=${serial_console}" # Set the grub console type GRUB_TERMINAL=console