s

Author: jmarrero

mantle/platform/util.go

@@ -236,7 +236,15 @@ func WaitForMachineSoftReboot(m Machine, j *Journal, timeout time.Duration, oldU
 			currentUserspaceTimestamp, err := GetMachineBootCount(m)
 			if err != nil {
 				// SSH might be temporarily unavailable during soft-reboot
-				if strings.Contains(err.Error(), "connection") {
+			if _, ok := err.(*ssh.ExitMissingError); ok {
+					continue
+				} else if strings.Contains(err.Error(), "connection reset by peer") {
+					continue
+				} else if strings.Contains(err.Error(), "handshake failed") {
+					continue
+				} else if strings.Contains(err.Error(), "dial tcp") {
+					continue
+				} else if strings.Contains(err.Error(), "connection") {
 					continue
 				}
 				c <- err