webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-24 09:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add collectd restart to networking/red

Browse Source 
Change collectd to run modules load only at first start
This commit is contained in:
Arne Fitzenreiter
2009-05-11 20:14:40 +02:00
parent ca530b2d9b
commit f950f2584c
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/initscripts/init.d/collectd
View File

@@ -13,6 +13,13 @@ fi
case "$1" in
start)
# If run from init and collectd already started then exit silent
if [ "$(basename $0)" != "collectd" ]; then
if [ "$(ps -A | grep " collectd$")" != "" ]; then
exit 0
fi
fi
# At first run search for sensors with sensors-detect
if [ ! -e /etc/sysconfig/lm_sensors ]; then
boot_mesg "Searching for Sensors..."
@@ -35,17 +42,21 @@ case "$1" in
fi
fi
boot_mesg -n "Loading Sensor Modules: "
for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
modprobe $modul > /dev/null 2>&1;
if [ ${?} = 0 ]; then
boot_mesg -n "$SUCCESS$modul$NORMAL ";
else
boot_mesg -n "$WARNING$modul$NORMAL ";
fi
done
boot_mesg;
echo_ok;
# Load sensor modules only first start
if [ ! -e /var/lock/sensor_modules ]; then
touch /var/lock/sensor_modules
boot_mesg -n "Loading Sensor Modules: "
for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
modprobe $modul > /dev/null 2>&1;
if [ ${?} = 0 ]; then
boot_mesg -n "$SUCCESS$modul$NORMAL ";
else
boot_mesg -n "$WARNING$modul$NORMAL ";
fi
done
boot_mesg;
echo_ok;
fi
# Enable sensors plugin if sensors found
if [ $( sensors 2>&1 | grep "No sensors found!" | wc -l ) == "1" ]; then

10
src/initscripts/init.d/networking/red
View File

@@ -73,6 +73,10 @@ 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
@@ -87,6 +91,7 @@ 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
@@ -132,6 +137,7 @@ case "${1}" in
else
boot_mesg "dhcpcd already running!" ${WARNING}
echo_warning
/etc/rc.d/init.d/collectd start
exit 2
fi
fi
@@ -185,6 +191,7 @@ 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
@@ -220,6 +227,7 @@ 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 ..."
@@ -357,7 +365,7 @@ 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
fi
;;