From f60bdf43c2364fe7ce8389b060bbdb3d822f4a1b Mon Sep 17 00:00:00 2001 From: Ryutaroh Matsumoto Date: Tue, 12 Jan 2021 02:28:27 +0100 Subject: fix: ARM-specific serial console settings --- armhf-uefi.vmdb | 1 + smoke-uefi-armhf.vmdb | 1 + vmdb/plugins/grub_plugin.py | 12 +++++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/armhf-uefi.vmdb b/armhf-uefi.vmdb index 0597b81..0d374e9 100644 --- a/armhf-uefi.vmdb +++ b/armhf-uefi.vmdb @@ -60,3 +60,4 @@ steps: - grub: uefi tag: / efi: efi + console: serial diff --git a/smoke-uefi-armhf.vmdb b/smoke-uefi-armhf.vmdb index 9f996f9..0906dcc 100644 --- a/smoke-uefi-armhf.vmdb +++ b/smoke-uefi-armhf.vmdb @@ -73,3 +73,4 @@ steps: - grub: uefi tag: rootfs efi: efifs + console: serial diff --git a/vmdb/plugins/grub_plugin.py b/vmdb/plugins/grub_plugin.py index 3d352d9..7905c97 100644 --- a/vmdb/plugins/grub_plugin.py +++ b/vmdb/plugins/grub_plugin.py @@ -170,9 +170,15 @@ class GrubStepRunner(vmdb.StepRunnerInterface): "rw", ] if console == "serial": - kernel_params.extend( - ["loglevel=3", "console=tty0", "console=ttyS0,115200n8"] - ) + if 'arm' in state.arch: + kernel_params.extend( + ["loglevel=3", "console=tty0", "console=ttyAMA0,115200n8"] + ) + else: + kernel_params.extend( + ["loglevel=3", "console=tty0", "console=ttyS0,115200n8"] + ) + if quiet: kernel_params.extend( [ -- cgit v1.2.1