diff --git a/src/etc/config.xml b/src/etc/config.xml index 052040e1e..1d961f54b 100644 --- a/src/etc/config.xml +++ b/src/etc/config.xml @@ -640,7 +640,7 @@ * * root - /usr/bin/nice -n20 adjkerntz -a + adjkerntz -a 1 @@ -649,7 +649,7 @@ * * root - /usr/bin/nice -n20 /usr/local/etc/rc.update_bogons.sh + /usr/local/etc/rc.update_bogons.sh */60 @@ -658,7 +658,7 @@ * * root - /usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 sshlockout + /usr/local/sbin/expiretable -v -t 3600 sshlockout 1 @@ -667,7 +667,7 @@ * * root - /usr/bin/nice -n20 /usr/local/etc/rc.dyndns.update + /usr/local/etc/rc.dyndns.update */60 @@ -676,7 +676,7 @@ * * root - /usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 virusprot + /usr/local/sbin/expiretable -v -t 3600 virusprot 30 @@ -685,7 +685,7 @@ * * root - /usr/bin/nice -n20 /usr/local/etc/rc.update_urltables + /usr/local/etc/rc.update_urltables diff --git a/src/etc/inc/rrd.inc b/src/etc/inc/rrd.inc index 3daa6a012..113793c46 100644 --- a/src/etc/inc/rrd.inc +++ b/src/etc/inc/rrd.inc @@ -218,7 +218,7 @@ function enable_rrd_graphing() { $captiveportalloggedin = "-loggedin.rrd"; $ntpd = "ntpd.rrd"; - $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; + $rrdtool = "/usr/local/bin/rrdtool"; $netstat = "/usr/bin/netstat"; $awk = "/usr/bin/awk"; $tar = "/usr/bin/tar"; @@ -906,7 +906,7 @@ function enable_rrd_graphing() { kill_traffic_collector(); /* start traffic collector */ - mwexec_bg("/usr/bin/nice -n20 /bin/sh $updaterrdscript"); + mwexec_bg("/bin/sh $updaterrdscript"); } else { /* kill off traffic collectors */ @@ -928,7 +928,7 @@ function create_gateway_quality_rrd($rrd_file) { global $g; $rrdinterval = 60; $valid = $rrdinterval * 2; - $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; + $rrdtool = "/usr/local/bin/rrdtool"; /* GATEWAY QUALITY, set up the rrd file */ if (!file_exists("$rrd_file")) { diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 0a52fae5b..5bf311263 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -404,7 +404,7 @@ function upgrade_025_to_026() { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/bin/nice -n20 newsyslog"; + $cron_item['command'] = "newsyslog"; $config['cron']['item'][] = $cron_item; @@ -415,7 +415,7 @@ function upgrade_025_to_026() { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/bin/nice -n20 adjkerntz -a"; + $cron_item['command'] = "adjkerntz -a"; $config['cron']['item'][] = $cron_item; @@ -426,7 +426,7 @@ function upgrade_025_to_026() { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/bin/nice -n20 /usr/local/etc/rc.update_bogons.sh"; + $cron_item['command'] = "/usr/local/etc/rc.update_bogons.sh"; $config['cron']['item'][] = $cron_item; @@ -437,7 +437,7 @@ function upgrade_025_to_026() { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 sshlockout"; + $cron_item['command'] = "/usr/local/sbin/expiretable -v -t 3600 sshlockout"; $config['cron']['item'][] = $cron_item; @@ -448,7 +448,7 @@ function upgrade_025_to_026() { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/bin/nice -n20 /usr/local/etc/rc.dyndns.update"; + $cron_item['command'] = "/usr/local/etc/rc.dyndns.update"; $config['cron']['item'][] = $cron_item; @@ -459,7 +459,7 @@ function upgrade_025_to_026() { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 virusprot"; + $cron_item['command'] = "/usr/local/sbin/expiretable -v -t 3600 virusprot"; $config['cron']['item'][] = $cron_item; @@ -470,7 +470,7 @@ function upgrade_025_to_026() { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/bin/nice -n20 /usr/local/sbin/expiretable -t 1800 snort2c"; + $cron_item['command'] = "/usr/local/sbin/expiretable -t 1800 snort2c"; $config['cron']['item'][] = $cron_item; } @@ -1908,7 +1908,7 @@ function upgrade_054_to_055() { $listtags = array("ds", "v", "rra", "row"); $rrddbpath = "/var/db/rrd/"; - $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; + $rrdtool = "/usr/local/bin/rrdtool"; if ($g['platform'] != "pfSense") { /* restore the databases, if we have one */ if (restore_rrd()) { @@ -2500,7 +2500,7 @@ function upgrade_075_to_076() { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/bin/nice -n20 /usr/local/etc/rc.update_urltables"; + $cron_item['command'] = "/usr/local/etc/rc.update_urltables"; $config['cron']['item'][] = $cron_item; } @@ -2570,7 +2570,7 @@ function upgrade_080_to_081() { $listtags = array("ds", "v", "rra", "row"); $rrddbpath = "/var/db/rrd/"; - $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; + $rrdtool = "/usr/local/bin/rrdtool"; if ($g['platform'] != "pfSense") { /* restore the databases, if we have one */ @@ -3080,7 +3080,7 @@ function upgrade_098_to_099() { function upgrade_099_to_100() { require_once("services.inc"); - install_cron_job("/usr/bin/nice -n20 newsyslog", false); + install_cron_job("newsyslog", false); } function upgrade_100_to_101() { diff --git a/src/etc/rc b/src/etc/rc index 343656ea3..8bcd1498d 100755 --- a/src/etc/rc +++ b/src/etc/rc @@ -2,7 +2,7 @@ # Copyright (C) 2004-2010 Scott Ullrich, All rights reserved. # Copyright (C) 2003-2004 Manuel Kasper . -# Copyright (C) 2014 Franco Fichtner +# Copyright (C) 2014-2015 Franco Fichtner # All rights reserved. stty status '^T' 2> /dev/null @@ -346,7 +346,7 @@ echo "done." /usr/local/etc/rc.php_ini_setup chmod u+rx /usr/local/opnsense/service/check_reload_status.py -/usr/bin/nice -n20 /usr/local/opnsense/service/check_reload_status.py +/usr/local/opnsense/service/check_reload_status.py sleep 1 # give check_reload_status some time to load to prevent missing socket # let the PHP-based configuration subsystem set up the system now diff --git a/src/etc/rc.backup_rrd.sh b/src/etc/rc.backup_rrd.sh index e2ef760d5..e20e077c1 100755 --- a/src/etc/rc.backup_rrd.sh +++ b/src/etc/rc.backup_rrd.sh @@ -8,7 +8,7 @@ if [ -d "${RRDDBPATH}" ]; then [ -z "$NO_REMOUNT" ] && /usr/local/etc/rc.conf_mount_rw for rrdfile in "${RRDDBPATH}"/*.rrd ; do xmlfile="${rrdfile%.rrd}.xml" - /usr/bin/nice -n20 /usr/local/bin/rrdtool dump "$rrdfile" "$xmlfile" + /usr/local/bin/rrdtool dump "$rrdfile" "$xmlfile" done cd / && tar -czf "${CF_CONF_PATH}"/rrd.tgz -C / "${RRDDBPATH#/}"/*.xml rm "${RRDDBPATH}"/*.xml diff --git a/src/etc/rc.firmware b/src/etc/rc.firmware index 7c7c4ea20..7c721adfd 100755 --- a/src/etc/rc.firmware +++ b/src/etc/rc.firmware @@ -433,7 +433,7 @@ pfSenseupgrade) ps -a | grep "check_reload_status" | awk '{print $1;}' | kill -9 echo "Installing $IMG." >> /conf/upgrade_log.txt 2>&1 cd / && /usr/bin/tar --exclude=./dev -xzUPf $IMG >> /conf/upgrade_log.txt 2>&1 - /usr/bin/nice -n20 /usr/local/opnsense/service/check_reload_status.py + /usr/local/opnsense/service/check_reload_status.py echo "Image installed $IMG." >> /conf/upgrade_log.txt 2>&1 # process custom image if its passed diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php index 90e9514c0..2eb00e1d8 100644 --- a/src/www/diag_backup.php +++ b/src/www/diag_backup.php @@ -35,13 +35,14 @@ ini_set('max_input_time', '0'); /* omit no-cache headers because it confuses IE with file downloads */ $omit_nocacheheaders = true; $nocsrf = true; -require("guiconfig.inc"); + +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); -$rrddbpath = "/var/db/rrd"; -$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; +$rrddbpath = '/var/db/rrd'; +$rrdtool = '/usr/local/bin/rrdtool'; function rrd_data_xml() { global $rrddbpath; diff --git a/src/www/status_rrd_graph_img.php b/src/www/status_rrd_graph_img.php index f2183d4f3..12de2ee2f 100644 --- a/src/www/status_rrd_graph_img.php +++ b/src/www/status_rrd_graph_img.php @@ -135,7 +135,7 @@ $prettydb = ucwords(str_replace($search, $replace, $curdatabase)); $rrddbpath = "/var/db/rrd/"; $rrdtmppath = "/tmp/"; -$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; +$rrdtool = "/usr/local/bin/rrdtool"; $uptime = "/usr/bin/uptime"; $sed = "/usr/bin/sed"; diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php index 71faa5ec5..64c7f6112 100644 --- a/src/www/system_advanced_firewall.php +++ b/src/www/system_advanced_firewall.php @@ -1,4 +1,5 @@