diff options
| author | Michael Pratt <mpratt@google.com> | 2018-12-21 07:58:27 -0800 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-12-21 18:08:49 +0100 |
| commit | 2fc01104d0081e0178522d3aa59938b7c3e0de57 (patch) | |
| tree | 8180b0801987ffe7241c4b492740d1d2ed0c7da8 /vm/gce | |
| parent | 588075e659832f8685d0c9dc9c75c461e023e77f (diff) | |
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.
Diffstat (limited to 'vm/gce')
| -rw-r--r-- | vm/gce/gce.go | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |