[neon/neon/livecd-rootfs/Neon/release] /: arm: fix console parameter for ARM cloud-images (LP: #2036730)

[Brian Murray]

Git commit c70fbe0a157d07265ad56689b26c545bad21fdf5 by Brian Murray.
Committed on 06/12/2023 at 20:02.
Pushed by carlosdem into branch 'Neon/release'.

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

M  +7    -0    debian/changelog
M  +11   -1    live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/c70fbe0a157d07265ad56689b26c545bad21fdf5

diff --git a/debian/changelog b/debian/changelog
index 87a5e4bc..d643fe48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.765.32) UNRELEASED; urgency=medium
+
+  [ Heinrich Schuchardt ]
+  * arm: fix console parameter for ARM cloud-images (LP: #2036730)
+
+ -- Brian Murray <brian at ubuntu.com>  Mon, 04 Dec 2023 13:46:09 -0800
+
 livecd-rootfs (2.765.31) jammy; urgency=medium
 
   [ John Chittum ]
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 3d780e6e..af48cb28 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
@@ -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