Преглед на файлове

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.
Vincent Bernat преди 12 години
родител
ревизия
64b817a5c1
променени са 1 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 5 5
      runtime.go

+ 5 - 5
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.")
 	}
 }