Merge pull request containerd#569 from crosbymichael/linux-builtin

Change linux runtime(w shim) to builtin
adshmh · Feb 27, 2017 · f471553 · f471553
2 parents c2c057a + e693cad
commit f471553
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git 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
diff --git 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
diff --git 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
@@ -1,4 +1,4 @@
-package main
+package linux
 
 import (
 	"fmt"