Merge pull request #1128 from c-po/per-arch-kernel-serial-interface

T8120: add support for per CPU architecture serial interface name

Author: sever-sever

data/architectures/amd64.toml

@@ -11,3 +11,5 @@ packages = [
   "intel-microcode",
   "amd64-microcode"
 ]
+
+serial_interface = "ttyS0,115200"

data/architectures/arm64.toml

@@ -4,3 +4,4 @@ packages = [
 ]
 bootloaders = "grub-efi"
 squashfs_compression_type = "xz -b 256k -always-use-fragments -no-recovery"
+serial_interface = "ttyAMA0,115200"

data/live-build-config/hooks/live/01-live-serial.binary

@@ -3,8 +3,15 @@
 GRUB_PATH=boot/grub/grub.cfg
 ISOLINUX_PATH=isolinux/live.cfg
 
-KVM_CONSOLE="console=ttyS0,115200 console=tty0"
-SERIAL_CONSOLE="console=tty0 console=ttyS0,115200"
+# Detect serial console type from existing GRUB config
+if grep -q "console=ttyAMA" "${GRUB_PATH}"; then
+    SERIAL_TTY="ttyAMA0"
+else
+    SERIAL_TTY="ttyS0"
+fi
+
+KVM_CONSOLE="console=${SERIAL_TTY},115200 console=tty0"
+SERIAL_CONSOLE="console=tty0 console=${SERIAL_TTY},115200"
 
 # Grub.cfg Update
 GRUB_MENUENTRY=$(sed -e '/menuentry.*hotkey.*/,/^}/!d' -e 's/--hotkey=l//g' $GRUB_PATH)

data/live-build-config/hooks/live/05-event_tty.chroot

@@ -1,3 +1,7 @@
+# This file is only needed to support upgrades from the legacy image management
+# tools. Example would be an upgrade from VyOS 1.3.8 -> 1.5 (which is officially
+# unsupported, but we always try our best). This is also the reason why we can
+# leave the ttyS0 console in this file - there was no ARM64 image for VyOS 1.3!
 menuentry "VyOS  (KVM console)" {
         linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=ttyS0,115200 console=tty0
         initrd /boot//initrd.img

data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry

@@ -631,8 +631,8 @@ DOCUMENTATION_URL="{build_config['documentation_url']}"
                 --archive-areas "{{debian_archive_areas}}" \
                 --backports true \
                 --binary-image iso-hybrid \
-                --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0" \
-                --bootappend-live-failsafe "live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0" \
+                --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console="{{serial_interface}}" console=tty0 net.ifnames=0 biosdevname=0" \
+                --bootappend-live-failsafe "live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal console="{{serial_interface}}" console=tty0 net.ifnames=0 biosdevname=0" \
                 --bootloaders "{{bootloaders}}" \
                 --checksums "sha256" \
                 --chroot-squashfs-compression-type "{{squashfs_compression_type}}" \