Merge pull request #5946 from crosbymichael/lxc-host-net

Fix network mode for lxc 1.0
2014-05-20 14:51:33 -07:00 · 2014-05-20 14:51:33 -07:00 · 1310243d48
parent 240fad4974 0f27894094
commit 1310243d48
1 changed files with 3 additions and 1 deletions
--- a/daemon/execdriver/lxc/lxc_template.go
+++ b/daemon/execdriver/lxc/lxc_template.go
@ -15,7 +15,9 @@ lxc.network.type = veth
 lxc.network.link = {{.Network.Interface.Bridge}}
 lxc.network.name = eth0
 lxc.network.mtu = {{.Network.Mtu}}
-{{else if not .Network.HostNetworking}}
+{{else if .Network.HostNetworking}}
+lxc.network.type = none
+{{else}}
 # network is disabled (-n=false)
 lxc.network.type = empty
 lxc.network.flags = up