diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-02-11 01:21:53 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-02-11 02:34:05 +0000 |
commit | ba2d65e6bc32d3fef4e6f4585dc356d83c3ec40d (patch) | |
tree | 1995c811b7396e7f5a4ed9fea694ae180aedcf0e /recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch | |
parent | f4853222b5d599672658e6d134370c48a0068f48 (diff) | |
download | meta-virtualization-ba2d65e6bc32d3fef4e6f4585dc356d83c3ec40d.tar.gz |
runc: update to 1.0.0-rc6
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch')
-rw-r--r-- | recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch index 9ccbccb2..0af74952 100644 --- a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch +++ b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch | |||
@@ -51,14 +51,13 @@ Index: git/src/import/signals.go | |||
51 | 51 | ||
52 | pid1, err := process.Pid() | 52 | pid1, err := process.Pid() |
53 | if err != nil { | 53 | if err != nil { |
54 | @@ -68,12 +66,61 @@ | 54 | @@ -68,11 +66,60 @@ |
55 | if h.notifySocket != nil { | 55 | if h.notifySocket != nil { |
56 | if detach { | 56 | if detach { |
57 | h.notifySocket.run(pid1) | 57 | h.notifySocket.run(pid1) |
58 | - return 0, nil | 58 | - return 0, nil |
59 | } else { | ||
60 | go h.notifySocket.run(0) | ||
61 | } | 59 | } |
60 | go h.notifySocket.run(0) | ||
62 | } | 61 | } |
63 | 62 | ||
64 | + if (detach) { | 63 | + if (detach) { |
@@ -118,7 +117,7 @@ Index: git/src/import/utils_linux.go | |||
118 | =================================================================== | 117 | =================================================================== |
119 | --- git.orig/src/import/utils_linux.go | 118 | --- git.orig/src/import/utils_linux.go |
120 | +++ git/src/import/utils_linux.go | 119 | +++ git/src/import/utils_linux.go |
121 | @@ -338,7 +338,7 @@ | 120 | @@ -347,7 +347,7 @@ |
122 | if err != nil { | 121 | if err != nil { |
123 | r.terminate(process) | 122 | r.terminate(process) |
124 | } | 123 | } |