From e693cad9262e10a370e0701cc72862bbbb327770 Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosbymichael@gmail.com>
Date: Fri, 24 Feb 2017 15:50:59 -0800
Subject: [PATCH] Change linux runtime(w shim) to builtin

Because of the plugin findings and having the default runtime builtin
this makes it much better for development and testing.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
---
 cmd/containerd/builtins.go | 1 +
 linux/Makefile             | 7 -------
 linux/container.go         | 2 +-
 linux/main.go              | 5 -----
 linux/runtime.go           | 2 +-
 linux/shim.go              | 2 +-
 6 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 linux/Makefile
 delete mode 100644 linux/main.go

diff --git a/cmd/containerd/builtins.go b/cmd/containerd/builtins.go
index 44de4b2..258b6f3 100644
--- a/cmd/containerd/builtins.go
+++ b/cmd/containerd/builtins.go
@@ -2,6 +2,7 @@ package main
 
 // register containerd builtins here
 import (
+	_ "github.com/docker/containerd/linux"
 	_ "github.com/docker/containerd/services/content"
 	_ "github.com/docker/containerd/services/execution"
 )
diff --git a/linux/Makefile b/linux/Makefile
deleted file mode 100644
index 9c0d447..0000000
--- a/linux/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-
-all:
-	go build -buildmode=plugin -o shim-linux-amd64.so
-
-install:
-	mkdir -p /var/lib/containerd/plugins
-	cp shim-linux-amd64.so /var/lib/containerd/plugins/
diff --git a/linux/container.go b/linux/container.go
index 17ad0ba..6e4ae9f 100644
--- a/linux/container.go
+++ b/linux/container.go
@@ -1,4 +1,4 @@
-package main
+package linux
 
 import (
 	"github.com/docker/containerd"
diff --git a/linux/main.go b/linux/main.go
deleted file mode 100644
index 3c21764..0000000
--- a/linux/main.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package main
-
-func main() {
-	panic("build as plugin not executable")
-}
diff --git a/linux/runtime.go b/linux/runtime.go
index 3ca5930..8aca808 100644
--- a/linux/runtime.go
+++ b/linux/runtime.go
@@ -1,4 +1,4 @@
-package main
+package linux
 
 import (
 	"bytes"
diff --git a/linux/shim.go b/linux/shim.go
index 9a74bb5..62cb032 100644
--- a/linux/shim.go
+++ b/linux/shim.go
@@ -1,4 +1,4 @@
-package main
+package linux
 
 import (
 	"fmt"