pkg/instance: make kernel reboot detection portable

The current code is linux specific, generalize it to other OSes.

4 files changed, 13 insertions, 13 deletions

diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
index cc04c5b35..1d35efa75 100644
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -6,7 +6,6 @@
 package instance
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -201,24 +200,23 @@ func (inst *inst) test() error {
 		}
 		if bootErr, ok := err.(vm.BootErrorer); ok {
 			testErr.Title, testErr.Output = bootErr.BootError()
-			// This linux-ism avoids detecting any crash during boot as "unexpected kernel reboot".
-			output := testErr.Output
-			if pos := bytes.Index(output, []byte("Booting the kernel.")); pos != -1 {
-				output = output[pos+1:]
+			rep := inst.reporter.Parse(testErr.Output)
+			if rep != nil && rep.Title == report.UnexpectedKernelReboot {
+				// Avoid detecting any boot crash as "unexpected kernel reboot".
+				rep = inst.reporter.Parse(testErr.Output[rep.EndPos:])
 			}
-			testErr.Report = inst.reporter.Parse(output)
-			if testErr.Report != nil {
-				testErr.Title = testErr.Report.Title
-			} else {
-				testErr.Report = &report.Report{
+			if rep == nil {
+				rep = &report.Report{
 					Title:  testErr.Title,
 					Output: testErr.Output,
 				}
 			}
-			if err := inst.reporter.Symbolize(testErr.Report); err != nil {
+			if err := inst.reporter.Symbolize(rep); err != nil {
 				// TODO(dvyukov): send such errors to dashboard.
 				log.Logf(0, "failed to symbolize report: %v", err)
 			}
+			testErr.Report = rep
+			testErr.Title = rep.Title
 		}
 		return testErr
 	}
diff --git a/pkg/report/fuchsia.go b/pkg/report/fuchsia.go
index 725c0b302..5e80501ab 100644
--- a/pkg/report/fuchsia.go
+++ b/pkg/report/fuchsia.go
@@ -287,7 +287,7 @@ var zirconOopses = []*oops{
 		[]oopsFormat{
 			{
 				title:        compile("welcome to Zircon"),
-				fmt:          "unexpected kernel reboot",
+				fmt:          UnexpectedKernelReboot,
 				noStackTrace: true,
 			},
 		},
diff --git a/pkg/report/linux.go b/pkg/report/linux.go
index b1b4dda8a..19a312f9b 100644
--- a/pkg/report/linux.go
+++ b/pkg/report/linux.go
@@ -1328,7 +1328,7 @@ var linuxOopses = []*oops{
 		[]oopsFormat{
 			{
 				title:        compile("Booting the kernel."),
-				fmt:          "unexpected kernel reboot",
+				fmt:          UnexpectedKernelReboot,
 				noStackTrace: true,
 			},
 		},
diff --git a/pkg/report/report.go b/pkg/report/report.go
index be6e31216..00dd74856 100644
--- a/pkg/report/report.go
+++ b/pkg/report/report.go
@@ -81,6 +81,8 @@ func NewReporter(cfg *mgrconfig.Config) (Reporter, error) {
 	return &reporterWrapper{rep, supps, typ}, nil
 }
 
+const UnexpectedKernelReboot = "unexpected kernel reboot"
+
 var ctors = map[string]fn{
 	"akaros":  ctorAkaros,
 	"linux":   ctorLinux,