Merge release-20210628.0-31-g052eb90dc (automated)

2 files changed, 3 insertions, 3 deletions

diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go
index 8d71d7447..165fb2ebb 100644
--- a/runsc/boot/loader.go
+++ b/runsc/boot/loader.go
@@ -1051,7 +1051,7 @@ func (l *Loader) waitPID(tgid kernel.ThreadID, cid string, waitStatus *uint32) e
 // to exit.
 func (l *Loader) wait(tg *kernel.ThreadGroup) uint32 {
 	tg.WaitExited()
-	return tg.ExitStatus().Status()
+	return uint32(tg.ExitStatus())
 }
 
 // WaitForStartSignal waits for a start signal from the control server.
@@ -1060,7 +1060,7 @@ func (l *Loader) WaitForStartSignal() {
 }
 
 // WaitExit waits for the root container to exit, and returns its exit status.
-func (l *Loader) WaitExit() kernel.ExitStatus {
+func (l *Loader) WaitExit() linux.WaitStatus {
 	// Wait for container.
 	l.k.WaitExited()
 
diff --git a/runsc/cmd/boot.go b/runsc/cmd/boot.go
index 42c66fbcf..f5c9821b2 100644
--- a/runsc/cmd/boot.go
+++ b/runsc/cmd/boot.go
@@ -255,7 +255,7 @@ func (b *Boot) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
 	ws := l.WaitExit()
 	log.Infof("application exiting with %+v", ws)
 	waitStatus := args[1].(*unix.WaitStatus)
-	*waitStatus = unix.WaitStatus(ws.Status())
+	*waitStatus = unix.WaitStatus(ws)
 	l.Destroy()
 	return subcommands.ExitSuccess
 }