diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-02-28 19:37:56 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-02-28 19:37:56 +0100 |
| commit | bd0de0defd2ba7c7753495e0f831805c4b6de89a (patch) | |
| tree | 1f448e0dec93a84f23f5d2fb24b517b15157eb80 /data | |
| parent | 6caf20d5471523362093b09b214f3020eaa804fd (diff) | |
| download | vyos-build-bd0de0defd2ba7c7753495e0f831805c4b6de89a.tar.gz vyos-build-bd0de0defd2ba7c7753495e0f831805c4b6de89a.zip | |
T8120: when building ISO bootloader, auto-detect serial console type
Diffstat (limited to 'data')
| -rwxr-xr-x | data/live-build-config/hooks/live/01-live-serial.binary | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/data/live-build-config/hooks/live/01-live-serial.binary b/data/live-build-config/hooks/live/01-live-serial.binary index 0e449fc9..b1f6b43b 100755 --- a/data/live-build-config/hooks/live/01-live-serial.binary +++ b/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) |