linux: propagate --runtime-root to shim properly

AkihiroSuda · AkihiroSuda · commit faf2781dd2db · 2018-02-28T14:15:22.000+09:00
Signed-off-by: Akihiro Suda &lt;suda.akihiro@lab.ntt.co.jp&gt;
diff --git a/linux/bundle.go b/linux/bundle.go
@@ -85,10 +85,14 @@ type bundle struct {
 type ShimOpt func(*bundle, string, *runctypes.RuncOptions) (shim.Config, client.Opt)
 
 // ShimRemote is a ShimOpt for connecting and starting a remote shim
-func ShimRemote(shimBinary, daemonAddress, cgroup string, debug bool, exitHandler func()) ShimOpt {
+func ShimRemote(c *Config, daemonAddress, cgroup string, exitHandler func()) ShimOpt {
 	return func(b *bundle, ns string, ropts *runctypes.RuncOptions) (shim.Config, client.Opt) {
-		return b.shimConfig(ns, ropts),
-			client.WithStart(shimBinary, b.shimAddress(ns), daemonAddress, cgroup, debug, exitHandler)
+		config := b.shimConfig(ns, ropts)
+		if config.RuntimeRoot == "" {
+			config.RuntimeRoot = c.RuntimeRoot
+		}
+		return config,
+			client.WithStart(c.Shim, b.shimAddress(ns), daemonAddress, cgroup, c.ShimDebug, exitHandler)
 	}
 }
 
diff --git a/linux/runtime.go b/linux/runtime.go
@@ -224,7 +224,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts
 				}).Warn("failed to clen up after killed shim")
 			}
 		}
-		shimopt = ShimRemote(r.config.Shim, r.address, cgroup, r.config.ShimDebug, exitHandler)
+		shimopt = ShimRemote(r.config, r.address, cgroup, exitHandler)
 	}
 
 	s, err := bundle.NewShimClient(ctx, namespace, shimopt, ropts)

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts`
`224`	`224`	`}).Warn("failed to clen up after killed shim")`
`225`	`225`	`}`
`226`	`226`	`}`
`227`		`- shimopt = ShimRemote(r.config.Shim, r.address, cgroup, r.config.ShimDebug, exitHandler)`
	`227`	`+ shimopt = ShimRemote(r.config, r.address, cgroup, exitHandler)`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`s, err := bundle.NewShimClient(ctx, namespace, shimopt, ropts)`