From c7f0c458dfaf043b1e30c021121dab43c058cbfa Mon Sep 17 00:00:00 2001 From: James DeFelice Date: Fri, 31 Jan 2014 12:44:20 -0500 Subject: [PATCH] Update lxc_template.go If networking is disabled, but then pipework is used later to add nics, the network still doesn't function. Using flags=up for empty networking fixes this. Docker-DCO-1.1-Signed-off-by: James DeFelice (github: jdef) Upstream-commit: 17c124baf6a0f3725615b22aa52ca96ac5b95326 Component: engine --- components/engine/execdriver/lxc/lxc_template.go | 1 + 1 file changed, 1 insertion(+) diff --git a/components/engine/execdriver/lxc/lxc_template.go b/components/engine/execdriver/lxc/lxc_template.go index 705bdf5363..a89365f989 100644 --- a/components/engine/execdriver/lxc/lxc_template.go +++ b/components/engine/execdriver/lxc/lxc_template.go @@ -15,6 +15,7 @@ lxc.network.name = eth0 {{else}} # network is disabled (-n=false) lxc.network.type = empty +lxc.network.flags = up {{end}} # root filesystem