diff --git a/cmd/containerd-shim-runc-v2/process/init.go b/cmd/containerd-shim-runc-v2/process/init.go index eaefda39da767..381c84e2839b6 100644 --- a/cmd/containerd-shim-runc-v2/process/init.go +++ b/cmd/containerd-shim-runc-v2/process/init.go @@ -287,6 +287,12 @@ func (p *Init) setExited(status int) { p.status = status p.Platform.ShutdownConsole(context.Background(), p.console) close(p.waitBlock) + if p.io != nil { + for _, c := range p.closers { + c.Close() + } + p.io.Close() + } } // Delete the init process @@ -312,12 +318,6 @@ func (p *Init) delete(ctx context.Context) error { err = p.runtimeError(err, "failed to delete task") } } - if p.io != nil { - for _, c := range p.closers { - c.Close() - } - p.io.Close() - } if err2 := mount.UnmountRecursive(p.Rootfs, 0); err2 != nil { log.G(ctx).WithError(err2).Warn("failed to cleanup rootfs mount") if err == nil { diff --git a/script/setup/runc-version b/script/setup/runc-version index 18fa8e74f9b44..7574079828deb 100644 --- a/script/setup/runc-version +++ b/script/setup/runc-version @@ -1 +1 @@ -v1.3.0 +v1.3.1