Skip to content

Commit

Permalink
Disable the subreaper on exec
Browse files Browse the repository at this point in the history
This keeps the flag but makes it hidden so that existing clients do not
encounter an error if we were to have removed the flag.

Signed-off-by: Michael Crosby <[email protected]>
  • Loading branch information
crosbymichael committed Aug 19, 2016
1 parent 6df383c commit f61c6e4
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
cli.BoolFlag{
Name: "no-subreaper",
Usage: "disable the use of the subreaper used to reap reparented processes",
Name: "no-subreaper",
Usage: "disable the use of the subreaper used to reap reparented processes",
Hidden: true,
},
},
Action: func(context *cli.Context) error {
Expand Down Expand Up @@ -115,7 +116,7 @@ func execProcess(context *cli.Context) (int, error) {
return -1, err
}
r := &runner{
enableSubreaper: !context.Bool("no-subreaper"),
enableSubreaper: false,
shouldDestroy: false,
container: container,
console: context.String("console"),
Expand Down

0 comments on commit f61c6e4

Please sign in to comment.