From 48b5d89e152769e3897ebfe36a17376da4e5364e Mon Sep 17 00:00:00 2001
From: Brian Murray <brian@ubuntu.com>
Date: Wed, 6 Dec 2023 11:30:25 -0800
Subject: [PATCH] arm: fix console parameter for ARM cloud-images (LP:
 #2036730)

---
 debian/changelog                                     |  7 +++++++
 .../ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot   | 12 +++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bff504c7..88dcda30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (23.10.57) UNRELEASED; urgency=medium
+
+  [ Heinrich Schuchardt ]
+  * arm: fix console parameter for ARM cloud-images (LP: #2036730)
+
+ -- Brian Murray <brian@ubuntu.com>  Mon, 04 Dec 2023 13:31:38 -0800
+
 livecd-rootfs (23.10.56) mantic; urgency=medium
 
   * Enable snap preseeding with ppc64el images where /boot/vmlinux is used
diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
index 12956529..772c4a0c 100755
--- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
@@ -170,6 +170,16 @@ fi
 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_RECORDFAIL_TIMEOUT=0
 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