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

Merge pull request #1497 from vincentbernat/fix/ipv4-forwarding-detection

Browse Source 
runtime: correctly detect IPv4 forwarding
Upstream-commit: 3f95d1b9bfca277995cfcc82b2bfe2f77a2648ea
Component: engine
This commit is contained in:
Victor Vieux
2013-08-12 02:07:03 -07:00
parent 871898eda4 8ef6c1627f
commit cfdc1ec57f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/runtime.go
+5 -5
View File
@@ -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.")
}
}