From ef6c0d53410c0be6f33d049e7998b54804497350 Mon Sep 17 00:00:00 2001 From: Josh Poimboeuf Date: Tue, 28 Jan 2014 13:24:38 -0600 Subject: [PATCH] remove ip_forward warning Now that docker sets /proc/sys/net/ipv4/ip_forward by default (unless the user manually specifies "-ip-forward=false"), there's no need to warn if its disabled. Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf (github: jpoimboe) --- pkg/sysinfo/sysinfo.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go index b3463f8cfe..27af37bb89 100644 --- a/pkg/sysinfo/sysinfo.go +++ b/pkg/sysinfo/sysinfo.go @@ -36,12 +36,6 @@ func New(quiet bool) *SysInfo { } } - content, err3 := ioutil.ReadFile("/proc/sys/net/ipv4/ip_forward") - sysInfo.IPv4ForwardingDisabled = err3 != nil || len(content) == 0 || content[0] != '1' - if sysInfo.IPv4ForwardingDisabled && !quiet { - log.Printf("WARNING: IPv4 forwarding is disabled.") - } - // Check if AppArmor seems to be enabled on this system. if _, err := os.Stat("/sys/kernel/security/apparmor"); os.IsNotExist(err) { sysInfo.AppArmor = false