summaryrefslogtreecommitdiffhomepage
path: root/runsc/boot
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-07-08 20:44:17 +0000
committergVisor bot <gvisor-bot@google.com>2021-07-08 20:44:17 +0000
commite4b190da475b0bc6a50229f30cb837116462c929 (patch)
treeb130373b7d2b1b9927e7e7b4ffb9f214e06d6874 /runsc/boot
parent3685a1eec38270bea760a0cd4a97df3a248a6046 (diff)
parent052eb90dc15e04dfd8397ca305c507399360dd0e (diff)
Merge release-20210628.0-31-g052eb90dc (automated)
Diffstat (limited to 'runsc/boot')
-rw-r--r--runsc/boot/loader.go4
1 files changed, 2 insertions, 2 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()