2 files changed, 18 insertions, 18 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..bcf4c103 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
@@ -12,11 +12,11 @@ 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 +25,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 {
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 0af74952..98b02044 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
@@ -33,15 +33,17 @@ Index: git/src/import/signals.go
 ===================================================================
 --- git.orig/src/import/signals.go
 +++ git/src/import/signals.go
-@@ -6,6 +6,7 @@
+@@ -5,7 +5,9 @@
+ import (
         "os"
         "os/signal"
-        "syscall" // only for Signal
-+       "strconv"
++       "syscall" // only for Signal
  
++        "strconv"
         "github.com/opencontainers/runc/libcontainer"
         "github.com/opencontainers/runc/libcontainer/system"
-@@ -56,9 +57,6 @@
+        "github.com/opencontainers/runc/libcontainer/utils"
+@@ -55,9 +57,6 @@
  func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach bool) (int, error) {
         // make sure we know the pid of our main process so that we can return
         // after it dies.
@@ -51,12 +53,13 @@ Index: git/src/import/signals.go
  
         pid1, err := process.Pid()
         if err != nil {
-@@ -68,11 +66,60 @@
+@@ -67,12 +66,61 @@
         if h.notifySocket != nil {
                 if detach {
                         h.notifySocket.run(pid1)
 -                       return 0, nil
                 }
+                h.notifySocket.run(os.Getpid())
                 go h.notifySocket.run(0)
         }
  
@@ -117,7 +120,7 @@ Index: git/src/import/utils_linux.go
 ===================================================================
 --- git.orig/src/import/utils_linux.go
 +++ git/src/import/utils_linux.go
-@@ -347,7 +347,7 @@
+@@ -349,7 +349,7 @@
         if err != nil {
                 r.terminate(process)
         }
@@ -125,4 +128,4 @@ Index: git/src/import/utils_linux.go
 +       if (detach && os.Getenv("SIGUSR1_PARENT_PID") == "") {
                 return 0, nil
         }
-        r.destroy()
+        if err == nil {