p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix network mode for lxc 1.0
Upstream-commit: 1310243d488cfede2f5765e79b01ab20efd46cc0
Component: engine
This commit is contained in:
Michael Crosby
2014-05-20 14:51:33 -07:00
parent 45b3b14782 417fd6d53a
commit c9d0eafbf0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/execdriver/lxc/lxc_template.go
View File

@ -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