Separate nsinit main from implementation. This is done inorder to pac…

…kage nsinit as part of docker binary. Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
pmorie · Jul 1, 2014 · 28dadc5 · 28dadc5
1 parent 77c5125
commit 28dadc5
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 9 deletions.
diff --git a/nsinit/main.go → nsinit/cli.go b/nsinit/main.go → nsinit/cli.go
@@ -1,4 +1,4 @@
-package main
+package nsinit
 
 import (
 	"log"
@@ -19,7 +19,7 @@ func preload(context *cli.Context) error {
 	return nil
 }
 
-func main() {
+func NsInit() {
 	app := cli.NewApp()
 	app.Name = "nsinit"
 	app.Version = "0.1"

diff --git a/nsinit/config.go b/nsinit/config.go
@@ -1,4 +1,4 @@
-package main
+package nsinit
 
 import (
 	"encoding/json"

diff --git a/nsinit/exec.go b/nsinit/exec.go
@@ -1,4 +1,4 @@
-package main
+package nsinit
 
 import (
 	"fmt"

diff --git a/nsinit/init.go b/nsinit/init.go
@@ -1,4 +1,4 @@
-package main
+package nsinit
 
 import (
 	"log"

diff --git a/nsinit/main/nsinit.go b/nsinit/main/nsinit.go
@@ -0,0 +1,7 @@
+package main
+
+import "github.com/docker/libcontainer/nsinit"
+
+func main() {
+	nsinit.NsInit()
+}
diff --git a/nsinit/nsenter.go b/nsinit/nsenter.go
@@ -1,4 +1,4 @@
-package main
+package nsinit
 
 import (
 	"log"

diff --git a/nsinit/pause.go b/nsinit/pause.go
@@ -1,4 +1,4 @@
-package main
+package nsinit
 
 import (
 	"log"

diff --git a/nsinit/stats.go b/nsinit/stats.go
@@ -1,4 +1,4 @@
-package main
+package nsinit
 
 import (
 	"encoding/json"

diff --git a/nsinit/utils.go b/nsinit/utils.go
@@ -1,4 +1,4 @@
-package main
+package nsinit
 
 import (
 	"encoding/json"