diff --git a/vendor.conf b/vendor.conf index ec53b1d8c..60b972316 100644 --- a/vendor.conf +++ b/vendor.conf @@ -1,4 +1,4 @@ -github.com/containerd/go-runc bcb223a061a3dd7de1a89c0b402a60f4dd9bd307 +github.com/containerd/go-runc f271fa2021de855d4d918dbef83c5fe19db1bdd5 github.com/containerd/console cb7008ab3d8359b78c5f464cb7cf160107ad5925 github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788 diff --git a/vendor/github.com/containerd/go-runc/console.go b/vendor/github.com/containerd/go-runc/console.go index e81730075..dc7b82ea0 100644 --- a/vendor/github.com/containerd/go-runc/console.go +++ b/vendor/github.com/containerd/go-runc/console.go @@ -43,7 +43,7 @@ func NewConsoleSocket(path string) (*Socket, error) { return nil, err } return &Socket{ - l: l, + l: l, }, nil } diff --git a/vendor/github.com/containerd/go-runc/runc.go b/vendor/github.com/containerd/go-runc/runc.go index 74d77c192..e4cf98e8e 100644 --- a/vendor/github.com/containerd/go-runc/runc.go +++ b/vendor/github.com/containerd/go-runc/runc.go @@ -512,10 +512,11 @@ type RestoreOpts struct { CheckpointOpts IO - Detach bool - PidFile string - NoSubreaper bool - NoPivot bool + Detach bool + PidFile string + NoSubreaper bool + NoPivot bool + ConsoleSocket ConsoleSocket } func (o *RestoreOpts) args() ([]string, error) { @@ -530,6 +531,9 @@ func (o *RestoreOpts) args() ([]string, error) { } out = append(out, "--pid-file", abs) } + if o.ConsoleSocket != nil { + out = append(out, "--console-socket", o.ConsoleSocket.Path()) + } if o.NoPivot { out = append(out, "--no-pivot") }