vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Update go-runc to abd8eada6a98acdf415d47a8d372dc314494c07f

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-01-23 11:35:18 -08:00
parent bf036b9d78
commit 911bc57483
2 changed files with 105 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
vendor/github.com/crosbymichael/go-runc/runc.go generated vendored
View file

@ -67,7 +67,7 @@ type CreateOpts struct {
IO
// PidFile is a path to where a pid file should be created
PidFile string
ConsoleSocket string
ConsoleSocket *ConsoleSocket
Detach bool
NoPivot bool
NoNewKeyring bool
@ -107,8 +107,8 @@ func (o *CreateOpts) args() (out []string) {
if o.PidFile != "" {
out = append(out, "--pid-file", o.PidFile)
}
if o.ConsoleSocket != "" {
out = append(out, "--console-socket", o.ConsoleSocket)
if o.ConsoleSocket != nil {
out = append(out, "--console-socket", o.ConsoleSocket.Path())
}
if o.NoPivot {
out = append(out, "--no-pivot")
@ -147,7 +147,7 @@ type ExecOpts struct {
Gid int
Cwd string
Tty bool
ConsoleSocket string
ConsoleSocket *ConsoleSocket
Detach bool
}
@ -156,8 +156,8 @@ func (o *ExecOpts) args() (out []string) {
if o.Tty {
out = append(out, "--tty")
}
if o.ConsoleSocket != "" {
out = append(out, "--console-socket", o.ConsoleSocket)
if o.ConsoleSocket != nil {
out = append(out, "--console-socket", o.ConsoleSocket.Path())
}
if o.Cwd != "" {
out = append(out, "--cwd", o.Cwd)