docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

runtime: correctly detect IPv4 forwarding
This commit is contained in:
Victor Vieux 2013-08-12 02:07:03 -07:00
parent 940d58806c 64b817a5c1
commit 3f95d1b9bf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime.go
View File

@ -241,13 +241,13 @@ func (runtime *Runtime) UpdateCapabilities(quiet bool) {
if !runtime.capabilities.SwapLimit && !quiet { if !runtime.capabilities.SwapLimit && !quiet {
log.Printf("WARNING: Your kernel does not support cgroup swap limit.") log.Printf("WARNING: Your kernel does not support cgroup swap limit.")
} }
}
content, err3 := ioutil.ReadFile("/proc/sys/net/ipv4/ip_forward") content, err3 := ioutil.ReadFile("/proc/sys/net/ipv4/ip_forward")
runtime.capabilities.IPv4Forwarding = err3 == nil && len(content) > 0 && content[0] == '1' runtime.capabilities.IPv4Forwarding = err3 == nil && len(content) > 0 && content[0] == '1'
if !runtime.capabilities.IPv4Forwarding && !quiet { if !runtime.capabilities.IPv4Forwarding && !quiet {
log.Printf("WARNING: IPv4 forwarding is disabled.") log.Printf("WARNING: IPv4 forwarding is disabled.")
} }
}
} }
// FIXME: harmonize with NewGraph() // FIXME: harmonize with NewGraph()