diff options
| author | Ryutaroh Matsumoto <ryutaroh@ict.e.titech.ac.jp> | 2021-01-12 02:28:27 +0100 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2021-01-16 06:00:17 +0000 |
| commit | f60bdf43c2364fe7ce8389b060bbdb3d822f4a1b (patch) | |
| tree | a7735ac3748400642e34ecdbaca97d97fa8c63af | |
| parent | d2e1dad4d5061d067387660b2d6f7cf94b768874 (diff) | |
| download | vmdb2-f60bdf43c2364fe7ce8389b060bbdb3d822f4a1b.tar.gz | |
fix: ARM-specific serial console settings
| -rw-r--r-- | armhf-uefi.vmdb | 1 | ||||
| -rw-r--r-- | smoke-uefi-armhf.vmdb | 1 | ||||
| -rw-r--r-- | 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( [ |