From 64b817a5c12545252d0cbb3d4ce1f23996bb266b Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 11 Aug 2013 11:52:16 +0200 Subject: [PATCH] runtime: correctly detect IPv4 forwarding When memory cgroup is absent, there was not attempt to detect if IPv4 forwarding was enabled and therefore, docker was printing a warning for each command spawning a new container. The test for IPv4 forwarding was guarded by the test for memory cgroup. --- runtime.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime.go b/runtime.go index 894028354e..0f97c01cba 100644 --- a/runtime.go +++ b/runtime.go @@ -241,12 +241,12 @@ func (runtime *Runtime) UpdateCapabilities(quiet bool) { if !runtime.capabilities.SwapLimit && !quiet { log.Printf("WARNING: Your kernel does not support cgroup swap limit.") } + } - content, err3 := ioutil.ReadFile("/proc/sys/net/ipv4/ip_forward") - runtime.capabilities.IPv4Forwarding = err3 == nil && len(content) > 0 && content[0] == '1' - if !runtime.capabilities.IPv4Forwarding && !quiet { - log.Printf("WARNING: IPv4 forwarding is disabled.") - } + content, err3 := ioutil.ReadFile("/proc/sys/net/ipv4/ip_forward") + runtime.capabilities.IPv4Forwarding = err3 == nil && len(content) > 0 && content[0] == '1' + if !runtime.capabilities.IPv4Forwarding && !quiet { + log.Printf("WARNING: IPv4 forwarding is disabled.") } }