From 2fc01104d0081e0178522d3aa59938b7c3e0de57 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Fri, 21 Dec 2018 07:58:27 -0800 Subject: vm: allow Diagnose to directly return diagnosis Rather than writing the diagnosis to the kernel console, Diagnose can now directly return the extra debugging info, which will be appended ot the kernel console log. --- vm/gce/gce.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vm/gce') diff --git a/vm/gce/gce.go b/vm/gce/gce.go index d2ce480ff..6f4c9f567 100644 --- a/vm/gce/gce.go +++ b/vm/gce/gce.go @@ -366,11 +366,11 @@ func waitForConsoleConnect(merger *vmimpl.OutputMerger) error { } } -func (inst *instance) Diagnose() bool { +func (inst *instance) Diagnose() ([]byte, bool) { if inst.env.OS == "openbsd" { - return vmimpl.DiagnoseOpenBSD(inst.consolew) + return nil, vmimpl.DiagnoseOpenBSD(inst.consolew) } - return false + return nil, false } func (pool *Pool) getSerialPortOutput(name, gceKey string) ([]byte, error) { -- cgit mrf-deployment