arm: fix console parameter for ARM cloud-images (LP: #2036730)

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.828.3) 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:42:29 -0800
+
 livecd-rootfs (2.828.2) lunar; urgency=medium
 
   [ Steve Langasek ]

live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot

@@ -197,6 +197,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
@@ -213,7 +223,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