From f61c6e413f09335bcd46458b3385d8ac4620aafd Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 19 Aug 2016 09:56:00 -0700 Subject: [PATCH] Disable the subreaper on exec 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 --- exec.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/exec.go b/exec.go index 55a5aeda..f3a22e09 100644 --- a/exec.go +++ b/exec.go @@ -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 { @@ -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"),