Skip to content

vm/adb: Don't check for ret code on adb shell reboot #6599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
a-nogikh merged 1 commit into from
Jan 20, 2026
Merged

vm/adb: Don't check for ret code on adb shell reboot #6599

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion vm/adb/adb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"io"
"os"
Expand Down Expand Up @@ -390,8 +391,16 @@ func (inst *instance) repair() error {
// reliable solution can be sought out.
if inst.cfg.TargetReboot {
if _, err := inst.adb("shell", "reboot"); err != nil {
return err
var verboseErr *osutil.VerboseError
if !errors.As(err, &verboseErr) {
return err
}

if verboseErr.ExitCode != 0 && verboseErr.ExitCode != 255 {
return err
}
}

// Now give it another 5 minutes to boot.
if !vmimpl.SleepInterruptible(10 * time.Second) {
return fmt.Errorf("shutdown in progress")
Expand Down
Loading