From d01fb047f461933b337a1064c19634339d25d259 Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosbymichael@gmail.com>
Date: Tue, 7 Nov 2017 12:12:53 -0500
Subject: [PATCH] Fix runtime root with no-shim

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
---
 linux/shim/init.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/linux/shim/init.go b/linux/shim/init.go
index 88c39a6f7..01c305bb6 100644
--- a/linux/shim/init.go
+++ b/linux/shim/init.go
@@ -98,12 +98,16 @@ func (s *Service) newInitProcess(context context.Context, r *shimapi.CreateTaskR
 			return nil, errors.Wrapf(err, "failed to mount rootfs component %v", m)
 		}
 	}
+	root := s.config.RuntimeRoot
+	if root == "" {
+		root = RuncRoot
+	}
 	runtime := &runc.Runc{
 		Command:       r.Runtime,
 		Log:           filepath.Join(s.config.Path, "log.json"),
 		LogFormat:     runc.JSON,
 		PdeathSignal:  syscall.SIGKILL,
-		Root:          filepath.Join(s.config.RuntimeRoot, s.config.Namespace),
+		Root:          filepath.Join(root, s.config.Namespace),
 		Criu:          s.config.Criu,
 		SystemdCgroup: s.config.SystemdCgroup,
 	}