diff options
Diffstat (limited to 'recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch')
| -rw-r--r-- | recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch index 48c1250d..cb0ddc37 100644 --- a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch +++ b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch @@ -7,16 +7,18 @@ This allows for setting up a detached session where you do not want to set the terminal to false in the config.json. More or less this is a runtime override. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Jason Wessel <jason.wessel@windriver.com> --- utils_linux.go | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/utils_linux.go b/utils_linux.go -index 8085f7fe..e6d31b35 100644 ---- a/src/import/utils_linux.go -+++ b/src/import/utils_linux.go -@@ -227,6 +227,11 @@ type runner struct { +Index: git/src/import/utils_linux.go +=================================================================== +--- git.orig/src/import/utils_linux.go ++++ git/src/import/utils_linux.go +@@ -267,6 +267,11 @@ } func (r *runner) run(config *specs.Process) (int, error) { @@ -25,9 +27,6 @@ index 8085f7fe..e6d31b35 100644 + r.consoleSocket = "" + config.Terminal = false + } - if err := r.checkTerminal(config); err != nil { - r.destroy() - return -1, err --- -2.11.0 - + var err error + defer func() { + if err != nil { |