From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 16 May 2009 16:10:13 +0000 (+0200)
Subject: Removed collectd restart from red (not helps against the spikes at ppp0 graph)
X-Git-Tag: v2.5-beta3~17
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=4528b1b612c907769ee81e89a563db8ec0ee6692

Removed collectd restart from red (not helps against the spikes at ppp0 graph)
---

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 1a79583060..abb3a6aa12 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -73,10 +73,6 @@ fi
 
 case "${1}" in
 	start)
-		# Stop collectd if running
-		if [ "$(ps -A | grep " collectd$")" != "" ]; then
-			/etc/rc.d/init.d/collectd stop
-		fi
 		if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then
 			boot_mesg "Bringing up the ${DEVICE} interface..."
 			boot_mesg_flush
@@ -91,7 +87,6 @@ case "${1}" in
 			else
 				boot_mesg "Interface ${DEVICE} doesn't exist." ${FAILURE}
 				echo_failure
-				/etc/rc.d/init.d/collectd start
 				exit 1
 			fi
 		fi
@@ -137,7 +132,6 @@ case "${1}" in
 				else
 					boot_mesg "dhcpcd already running!" ${WARNING}
 					echo_warning
-					/etc/rc.d/init.d/collectd start
 					exit 2
 				fi
 			fi
@@ -191,7 +185,6 @@ case "${1}" in
 			if ( ps ax | grep -q [p]ppd ); then 
 			    boot_mesg "pppd is still running." ${FAILURE}
 			    echo_failure
-			    /etc/init.d/collectd start
 			    exit 1
 			fi
 			
@@ -227,7 +220,6 @@ case "${1}" in
 				if [ "$PPP_NIC" == "" ]; then
 					boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE}
 					echo_failure
-					/etc/rc.d/init.d/collectd start
 					exit 0
 				fi
 				boot_mesg "Bringing up the $TYPE interface on $PPP_NIC ..."
@@ -365,7 +357,6 @@ case "${1}" in
 			## Create & Enable vnstat
 			/usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
 			/etc/rc.d/init.d/connectd start
-			/etc/rc.d/init.d/collectd start
 			exit 0
 		fi
 		;;