From d61433def89edf698118a77f02116dd53a453d29 Mon Sep 17 00:00:00 2001 From: Ryutaroh Matsumoto Date: Tue, 12 Jan 2021 02:46:08 +0100 Subject: fix: PowerPC-specific serial console settings --- ppc64el.vmdb | 2 +- smoke-ppc64el.vmdb | 2 +- vmdb/plugins/grub_plugin.py | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ppc64el.vmdb b/ppc64el.vmdb index 60f4223..5bc4cba 100644 --- a/ppc64el.vmdb +++ b/ppc64el.vmdb @@ -58,4 +58,4 @@ steps: - grub: ieee1275 tag: / prep: prep - quiet: false + console: serial diff --git a/smoke-ppc64el.vmdb b/smoke-ppc64el.vmdb index 74ce1c9..1111de5 100644 --- a/smoke-ppc64el.vmdb +++ b/smoke-ppc64el.vmdb @@ -70,4 +70,4 @@ steps: - grub: ieee1275 tag: rootfs prep: prep - quiet: false + console: serial diff --git a/vmdb/plugins/grub_plugin.py b/vmdb/plugins/grub_plugin.py index b57ce72..60b777b 100644 --- a/vmdb/plugins/grub_plugin.py +++ b/vmdb/plugins/grub_plugin.py @@ -189,7 +189,11 @@ class GrubStepRunner(vmdb.StepRunnerInterface): "rw", ] if console == "serial": - if 'arm' in state.arch: + if 'ppc64' in state.arch: + kernel_params.extend( + ["loglevel=3", "console=tty0", "console=hvc0,115200n8"] + ) + elif 'arm' in state.arch: kernel_params.extend( ["loglevel=3", "console=tty0", "console=ttyAMA0,115200n8"] ) -- cgit v1.2.1