jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #993 from crosbymichael/disable-subreaper-exec 

Disable the subreaper on exec
This commit is contained in:
Daniel, Dao Quang Minh 2016-08-19 18:18:08 +01:00 committed by GitHub
parent 84c344d260 f61c6e413f
commit c520720728
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
exec.go
View File

@ -79,8 +79,9 @@ following will output a list of processes running in the container:
Usage: "add a capability to the bounding set for the process", Usage: "add a capability to the bounding set for the process",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "no-subreaper", Name: "no-subreaper",
Usage: "disable the use of the subreaper used to reap reparented processes", Usage: "disable the use of the subreaper used to reap reparented processes",
Hidden: true,
}, },
}, },
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
@ -115,7 +116,7 @@ func execProcess(context *cli.Context) (int, error) {
return -1, err return -1, err
} }
r := &runner{ r := &runner{
enableSubreaper: !context.Bool("no-subreaper"), enableSubreaper: false,
shouldDestroy: false, shouldDestroy: false,
container: container, container: container,
console: context.String("console"), console: context.String("console"),