From 0457b13043a686c350b755a2f1e3a4baaacf7094 Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Wed, 10 May 2017 15:12:50 -0700
Subject: [PATCH] Allow the shim binary to be specified

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
---
 linux/runtime.go | 23 ++++++++++++++---------
 linux/shim.go    |  4 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/linux/runtime.go b/linux/runtime.go
index fdb11d37b..818a71d84 100644
--- a/linux/runtime.go
+++ b/linux/runtime.go
@@ -27,23 +27,29 @@ const (
 	runtimeName    = "linux"
 	configFilename = "config.json"
 	defaultRuntime = "runc"
+	defaultShim    = "containerd-shim"
 )
 
 func init() {
 	plugin.Register(runtimeName, &plugin.Registration{
-		Type:   plugin.RuntimePlugin,
-		Init:   New,
-		Config: &Config{},
+		Type: plugin.RuntimePlugin,
+		Init: New,
+		Config: &Config{
+			Shim:    defaultShim,
+			Runtime: defaultRuntime,
+		},
 	})
 }
 
 var _ = (plugin.Runtime)(&Runtime{})
 
 type Config struct {
+	// Shim is a path or name of binary implementing the Shim GRPC API
+	Shim string `toml:"shim,omitempty"`
 	// Runtime is a path or name of an OCI runtime used by the shim
-	Runtime string `toml:"runtime"`
+	Runtime string `toml:"runtime,omitempty"`
 	// NoShim calls runc directly from within the pkg
-	NoShim bool `toml:"no_shim"`
+	NoShim bool `toml:"no_shim,omitempty"`
 }
 
 func New(ic *plugin.InitContext) (interface{}, error) {
@@ -52,13 +58,11 @@ func New(ic *plugin.InitContext) (interface{}, error) {
 		return nil, err
 	}
 	cfg := ic.Config.(*Config)
-	if cfg.Runtime == "" {
-		cfg.Runtime = defaultRuntime
-	}
 	c, cancel := context.WithCancel(ic.Context)
 	r := &Runtime{
 		root:          path,
 		remote:        !cfg.NoShim,
+		shim:          cfg.Shim,
 		runtime:       cfg.Runtime,
 		events:        make(chan *containerd.Event, 2048),
 		eventsContext: c,
@@ -72,6 +76,7 @@ func New(ic *plugin.InitContext) (interface{}, error) {
 
 type Runtime struct {
 	root    string
+	shim    string
 	runtime string
 	remote  bool
 
@@ -86,7 +91,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts plugin.CreateOpts)
 	if err != nil {
 		return nil, err
 	}
-	s, err := newShim(path, r.remote)
+	s, err := newShim(r.shim, path, r.remote)
 	if err != nil {
 		os.RemoveAll(path)
 		return nil, err
diff --git a/linux/shim.go b/linux/shim.go
index f054b58e9..0edc6270b 100644
--- a/linux/shim.go
+++ b/linux/shim.go
@@ -22,7 +22,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-func newShim(path string, remote bool) (shim.ShimClient, error) {
+func newShim(shimName string, path string, remote bool) (shim.ShimClient, error) {
 	if !remote {
 		return localShim.Client(path)
 	}
@@ -31,7 +31,7 @@ func newShim(path string, remote bool) (shim.ShimClient, error) {
 	if err != nil {
 		return nil, err
 	}
-	cmd := exec.Command("containerd-shim")
+	cmd := exec.Command(shimName)
 	cmd.Dir = path
 	f, err := l.(*net.UnixListener).File()
 	if err != nil {