瀏覽代碼

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

Fix network mode for lxc 1.0
Michael Crosby 11 年之前
父節點
當前提交
1310243d48
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      daemon/execdriver/lxc/lxc_template.go

+ 3 - 1
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