From 7b18bbb446baa624d7825c4e615671a7e3104460 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 6 Jan 2010 01:30:16 -0500
Subject: We don't echo when we *set* forwarding; there's no reason to echo
 when we disable it either. (#552653)

---
 rc.d/init.d/network | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'rc.d/init.d/network')

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 7f9f5748..13ad4e78 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -219,13 +219,7 @@ case "$1" in
 
 	action $"Shutting down loopback interface: " ./ifdown ifcfg-lo
 
-	if [ -d /proc/sys/net/ipv4 ]; then
-	  if [ -f /proc/sys/net/ipv4/ip_forward ]; then
-		if [ $(cat /proc/sys/net/ipv4/ip_forward) != 0 ]; then
-			action $"Disabling IPv4 packet forwarding: " sysctl -w net.ipv4.ip_forward=0
-		fi
-	  fi
-	fi
+	sysctl -w net.ipv4.ip_forward=0 > /dev/null 2>&1
 
 	# IPv6 hook (post IPv4 stop)
 	if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then
-- 
cgit v1.2.1