pkg/osutil: make VerboseError nest other errors

After this change it fits more naturally into the Go's error
functionality.

2 files changed, 5 insertions, 2 deletions

diff --git a/vm/vmimpl/util.go b/vm/vmimpl/util.go
index 2df514ac6..729e78de6 100644
--- a/vm/vmimpl/util.go
+++ b/vm/vmimpl/util.go
@@ -57,7 +57,10 @@ func WaitForSSH(timeout time.Duration, opts SSHOptions, OS string, stop chan err
 			log.Logf(0, "ssh failed: %v", err)
 		}
 		if time.Since(startTime) > timeout {
-			return &osutil.VerboseError{Title: "can't ssh into the instance", Output: []byte(err.Error())}
+			return &osutil.VerboseError{
+				Err:    fmt.Errorf("can't ssh into the instance"),
+				Output: []byte(err.Error()),
+			}
 		}
 	}
 }
diff --git a/vm/vmimpl/vmimpl.go b/vm/vmimpl/vmimpl.go
index 480fb85b5..963c88086 100644
--- a/vm/vmimpl/vmimpl.go
+++ b/vm/vmimpl/vmimpl.go
@@ -104,7 +104,7 @@ func MakeBootError(err error, output []byte) error {
 	}
 	var verboseError *osutil.VerboseError
 	if errors.As(err, &verboseError) {
-		return BootError{verboseError.Title, append(verboseError.Output, output...)}
+		return BootError{verboseError.Error(), append(verboseError.Output, output...)}
 	}
 	return BootError{err.Error(), output}
 }