kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

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

Browse source 
runtime: correctly detect IPv4 forwarding
This commit is contained in:
Victor Vieux 2013-08-12 02:07:03 -07:00
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,6 +241,7 @@ 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'
@ -248,7 +249,6 @@ func (runtime *Runtime) UpdateCapabilities(quiet bool) {
log.Printf("WARNING: IPv4 forwarding is disabled.") log.Printf("WARNING: IPv4 forwarding is disabled.")
} }
} }
}
// FIXME: harmonize with NewGraph() // FIXME: harmonize with NewGraph()
func NewRuntime(flGraphPath string, autoRestart bool, dns []string) (*Runtime, error) { func NewRuntime(flGraphPath string, autoRestart bool, dns []string) (*Runtime, error) {