From ca35c2d459ec3c43f93d378f0a7bad20bb684f3a Mon Sep 17 00:00:00 2001
From: user <user@localhost>
Date: Sun, 7 Jun 2015 23:26:31 +0000
Subject: [PATCH] Fixed launching container with "host" network (ie: no network
 ns)

---
 oz-daemon/launch.go | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/oz-daemon/launch.go b/oz-daemon/launch.go
index 5214275..9f52df9 100644
--- a/oz-daemon/launch.go
+++ b/oz-daemon/launch.go
@@ -47,14 +47,22 @@ func findSandbox(id int) *Sandbox {
 }
 */
 
-const initCloneFlags = syscall.CLONE_NEWNS | syscall.CLONE_NEWIPC | syscall.CLONE_NEWPID | syscall.CLONE_NEWUTS | syscall.CLONE_NEWNET
-
-func createInitCommand(name, chroot string, uid uint32, display int, stn *network.SandboxNetwork) *exec.Cmd {
+func createInitCommand(name, chroot string, uid uint32, display int, stn *network.SandboxNetwork, nettype string) *exec.Cmd {
 	cmd := exec.Command(initPath)
 	cmd.Dir = "/"
+
+	cloneFlags := uintptr(syscall.CLONE_NEWNS)
+	cloneFlags |= syscall.CLONE_NEWIPC
+	cloneFlags |= syscall.CLONE_NEWPID
+	cloneFlags |= syscall.CLONE_NEWUTS
+	
+	if nettype != "host" {
+		cloneFlags |= syscall.CLONE_NEWNET
+	}
+	
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Chroot:     chroot,
-		Cloneflags: initCloneFlags,
+		Cloneflags: cloneFlags,
 	}
 	cmd.Env = []string{
 		"INIT_PROFILE=" + name,
@@ -98,7 +106,7 @@ func (d *daemonState) launch(p *oz.Profile, uid, gid uint32, log *logging.Logger
 		}
 	}
 	
-	cmd := createInitCommand(p.Name, fs.Root(), uid, display, stn)
+	cmd := createInitCommand(p.Name, fs.Root(), uid, display, stn, p.Networking.Nettype)
 	log.Debug("Command environment: %+v", cmd.Env)
 	pp, err := cmd.StderrPipe()
 	if err != nil {