Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-06 15:42:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm: fix console parameter for ARM cloud-images

Browse Source 
On armhf and arm64 the QEMU virt machine provides the serial console as an
emulated AMBA PrimeCell UART which the kernel refers to as /dev/ttyAMA0.

Consider this when constructing GRUB_CMDLINE_LINUX_DEFAULT in file
/etc/default/grub.d/50-cloudimg-settings.cfg (LP: #2036730).

Reviewed-by: Gauthier Jolly <gauthier.jolly@canonical.com>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2023-10-06 12:42:14 +02:00
parent 14778d8aa8
commit 21321ac018
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,6 +170,16 @@ fi
psuedo_grub_probe > "${gprobe}" psuedo_grub_probe > "${gprobe}"
chmod 755 "${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 # for Quantal and later, use /etc/default/grub.d functionality
# rather than modifying the grub configuration itself. # rather than modifying the grub configuration itself.
# This avoids the mess of having to do dpkg stuff # This avoids the mess of having to do dpkg stuff
@ -186,7 +196,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
GRUB_TIMEOUT=0 GRUB_TIMEOUT=0
# Set the default commandline # 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 # Set the grub console type
GRUB_TERMINAL=console GRUB_TERMINAL=console