mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
runc-docker: Add --console-socket=/dev/null
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. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
parent
d2dbd7d8d2
commit
11fac209f2
|
@ -0,0 +1,33 @@
|
||||||
|
From 3fff2a3505fba1d1ff0074edff15708a77f6cfa9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jason Wessel <jason.wessel@windriver.com>
|
||||||
|
Date: Wed, 12 Jul 2017 13:35:03 -0700
|
||||||
|
Subject: [PATCH] runc: Add --console-socket=/dev/null
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
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/utils_linux.go
|
||||||
|
+++ b/utils_linux.go
|
||||||
|
@@ -227,6 +227,11 @@ type runner struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *runner) run(config *specs.Process) (int, error) {
|
||||||
|
+ if (r.consoleSocket == "/dev/null") {
|
||||||
|
+ r.detach = false
|
||||||
|
+ r.consoleSocket = ""
|
||||||
|
+ config.Terminal = false
|
||||||
|
+ }
|
||||||
|
if err := r.checkTerminal(config); err != nil {
|
||||||
|
r.destroy()
|
||||||
|
return -1, err
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
|
@ -7,6 +7,7 @@ SRC_URI = "git://github.com/docker/runc.git;nobranch=1;name=runc-docker \
|
||||||
file://0001-Update-to-runtime-spec-198f23f827eea397d4331d7eb048d.patch \
|
file://0001-Update-to-runtime-spec-198f23f827eea397d4331d7eb048d.patch \
|
||||||
file://0002-Remove-Platform-as-no-longer-in-OCI-spec.patch \
|
file://0002-Remove-Platform-as-no-longer-in-OCI-spec.patch \
|
||||||
file://0003-Update-memory-specs-to-use-int64-not-uint64.patch \
|
file://0003-Update-memory-specs-to-use-int64-not-uint64.patch \
|
||||||
|
file://0001-runc-Add-console-socket-dev-null.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
RUNC_VERSION = "1.0.0-rc3"
|
RUNC_VERSION = "1.0.0-rc3"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user