diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-04-04 10:42:48 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-04-04 10:42:48 -0300 |
| commit | f599d893fff3d78f44068dc3ba238046d933ddb1 (patch) | |
| tree | e4b2c4707df823ca6b9cabeb25fe908f9caa531b /etc/inc/rrd.inc | |
| parent | 7de4284cffe27ed6b1f4335dd39b31cd3f852321 (diff) | |
| parent | 1309faddc84d101fb0ecba85782d97b04a2a1a9f (diff) | |
| download | pfsense-f599d893fff3d78f44068dc3ba238046d933ddb1.zip pfsense-f599d893fff3d78f44068dc3ba238046d933ddb1.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/shaper.inc
Diffstat (limited to 'etc/inc/rrd.inc')
| -rw-r--r-- | etc/inc/rrd.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc index 1a04860..0a806c3 100644 --- a/etc/inc/rrd.inc +++ b/etc/inc/rrd.inc @@ -811,9 +811,8 @@ function enable_rrd_graphing() { } function kill_traffic_collector() { - mwexec("killall top", true); mwexec("killall rrdtool", true); - mwexec("/bin/pkill -f updaterrd.sh", true); + mwexec("/bin/pkill -a -f updaterrd.sh", true); } ?> |
