Skip to content

O
OpnSense
Commit 22a3d39e authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

src: Niceness cannot be bought; it has to be earned.

parent aa3a73bf
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 31 deletions
src/etc/config.xml
View file @ 22a3d39e
...@@ -640,7 +640,7 @@ ...@@ -640,7 +640,7 @@
<month>*</month> <month>*</month>
<wday>*</wday> <wday>*</wday>
<who>root</who> <who>root</who>
<command>/usr/bin/nice -n20 adjkerntz -a</command> <command>adjkerntz -a</command>
</item> </item>
<item> <item>
<minute>1</minute> <minute>1</minute>
...@@ -649,7 +649,7 @@ ...@@ -649,7 +649,7 @@
<month>*</month> <month>*</month>
<wday>*</wday> <wday>*</wday>
<who>root</who> <who>root</who>
<command>/usr/bin/nice -n20 /usr/local/etc/rc.update_bogons.sh</command> <command>/usr/local/etc/rc.update_bogons.sh</command>
</item> </item>
<item> <item>
<minute>*/60</minute> <minute>*/60</minute>
...@@ -658,7 +658,7 @@ ...@@ -658,7 +658,7 @@
<month>*</month> <month>*</month>
<wday>*</wday> <wday>*</wday>
<who>root</who> <who>root</who>
<command>/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 sshlockout</command> <command>/usr/local/sbin/expiretable -v -t 3600 sshlockout</command>
</item> </item>
<item> <item>
<minute>1</minute> <minute>1</minute>
...@@ -667,7 +667,7 @@ ...@@ -667,7 +667,7 @@
<month>*</month> <month>*</month>
<wday>*</wday> <wday>*</wday>
<who>root</who> <who>root</who>
<command>/usr/bin/nice -n20 /usr/local/etc/rc.dyndns.update</command> <command>/usr/local/etc/rc.dyndns.update</command>
</item> </item>
<item> <item>
<minute>*/60</minute> <minute>*/60</minute>
...@@ -676,7 +676,7 @@ ...@@ -676,7 +676,7 @@
<month>*</month> <month>*</month>
<wday>*</wday> <wday>*</wday>
<who>root</who> <who>root</who>
<command>/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 virusprot</command> <command>/usr/local/sbin/expiretable -v -t 3600 virusprot</command>
</item> </item>
<item> <item>
<minute>30</minute> <minute>30</minute>
...@@ -685,7 +685,7 @@ ...@@ -685,7 +685,7 @@
<month>*</month> <month>*</month>
<wday>*</wday> <wday>*</wday>
<who>root</who> <who>root</who>
<command>/usr/bin/nice -n20 /usr/local/etc/rc.update_urltables</command> <command>/usr/local/etc/rc.update_urltables</command>
</item> </item>
</cron> </cron>
<wol> <wol>
......
src/etc/inc/rrd.inc
View file @ 22a3d39e
...@@ -218,7 +218,7 @@ function enable_rrd_graphing() { ...@@ -218,7 +218,7 @@ function enable_rrd_graphing() {
$captiveportalloggedin = "-loggedin.rrd"; $captiveportalloggedin = "-loggedin.rrd";
$ntpd = "ntpd.rrd"; $ntpd = "ntpd.rrd";
$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $rrdtool = "/usr/local/bin/rrdtool";
$netstat = "/usr/bin/netstat"; $netstat = "/usr/bin/netstat";
$awk = "/usr/bin/awk"; $awk = "/usr/bin/awk";
$tar = "/usr/bin/tar"; $tar = "/usr/bin/tar";
...@@ -906,7 +906,7 @@ function enable_rrd_graphing() { ...@@ -906,7 +906,7 @@ function enable_rrd_graphing() {
kill_traffic_collector(); kill_traffic_collector();
/* start traffic collector */ /* start traffic collector */
mwexec_bg("/usr/bin/nice -n20 /bin/sh $updaterrdscript"); mwexec_bg("/bin/sh $updaterrdscript");
} else { } else {
/* kill off traffic collectors */ /* kill off traffic collectors */
...@@ -928,7 +928,7 @@ function create_gateway_quality_rrd($rrd_file) { ...@@ -928,7 +928,7 @@ function create_gateway_quality_rrd($rrd_file) {
global $g; global $g;
$rrdinterval = 60; $rrdinterval = 60;
$valid = $rrdinterval * 2; $valid = $rrdinterval * 2;
$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $rrdtool = "/usr/local/bin/rrdtool";
/* GATEWAY QUALITY, set up the rrd file */ /* GATEWAY QUALITY, set up the rrd file */
if (!file_exists("$rrd_file")) { if (!file_exists("$rrd_file")) {
......
src/etc/inc/upgrade_config.inc
View file @ 22a3d39e
...@@ -404,7 +404,7 @@ function upgrade_025_to_026() { ...@@ -404,7 +404,7 @@ function upgrade_025_to_026() {
$cron_item['month'] = "*"; $cron_item['month'] = "*";
$cron_item['wday'] = "*"; $cron_item['wday'] = "*";
$cron_item['who'] = "root"; $cron_item['who'] = "root";
$cron_item['command'] = "/usr/bin/nice -n20 newsyslog"; $cron_item['command'] = "newsyslog";
$config['cron']['item'][] = $cron_item; $config['cron']['item'][] = $cron_item;
...@@ -415,7 +415,7 @@ function upgrade_025_to_026() { ...@@ -415,7 +415,7 @@ function upgrade_025_to_026() {
$cron_item['month'] = "*"; $cron_item['month'] = "*";
$cron_item['wday'] = "*"; $cron_item['wday'] = "*";
$cron_item['who'] = "root"; $cron_item['who'] = "root";
$cron_item['command'] = "/usr/bin/nice -n20 adjkerntz -a"; $cron_item['command'] = "adjkerntz -a";
$config['cron']['item'][] = $cron_item; $config['cron']['item'][] = $cron_item;
...@@ -426,7 +426,7 @@ function upgrade_025_to_026() { ...@@ -426,7 +426,7 @@ function upgrade_025_to_026() {
$cron_item['month'] = "*"; $cron_item['month'] = "*";
$cron_item['wday'] = "*"; $cron_item['wday'] = "*";
$cron_item['who'] = "root"; $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; $config['cron']['item'][] = $cron_item;
...@@ -437,7 +437,7 @@ function upgrade_025_to_026() { ...@@ -437,7 +437,7 @@ function upgrade_025_to_026() {
$cron_item['month'] = "*"; $cron_item['month'] = "*";
$cron_item['wday'] = "*"; $cron_item['wday'] = "*";
$cron_item['who'] = "root"; $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; $config['cron']['item'][] = $cron_item;
...@@ -448,7 +448,7 @@ function upgrade_025_to_026() { ...@@ -448,7 +448,7 @@ function upgrade_025_to_026() {
$cron_item['month'] = "*"; $cron_item['month'] = "*";
$cron_item['wday'] = "*"; $cron_item['wday'] = "*";
$cron_item['who'] = "root"; $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; $config['cron']['item'][] = $cron_item;
...@@ -459,7 +459,7 @@ function upgrade_025_to_026() { ...@@ -459,7 +459,7 @@ function upgrade_025_to_026() {
$cron_item['month'] = "*"; $cron_item['month'] = "*";
$cron_item['wday'] = "*"; $cron_item['wday'] = "*";
$cron_item['who'] = "root"; $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; $config['cron']['item'][] = $cron_item;
...@@ -470,7 +470,7 @@ function upgrade_025_to_026() { ...@@ -470,7 +470,7 @@ function upgrade_025_to_026() {
$cron_item['month'] = "*"; $cron_item['month'] = "*";
$cron_item['wday'] = "*"; $cron_item['wday'] = "*";
$cron_item['who'] = "root"; $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; $config['cron']['item'][] = $cron_item;
} }
...@@ -1908,7 +1908,7 @@ function upgrade_054_to_055() { ...@@ -1908,7 +1908,7 @@ function upgrade_054_to_055() {
$listtags = array("ds", "v", "rra", "row"); $listtags = array("ds", "v", "rra", "row");
$rrddbpath = "/var/db/rrd/"; $rrddbpath = "/var/db/rrd/";
$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $rrdtool = "/usr/local/bin/rrdtool";
if ($g['platform'] != "pfSense") { if ($g['platform'] != "pfSense") {
/* restore the databases, if we have one */ /* restore the databases, if we have one */
if (restore_rrd()) { if (restore_rrd()) {
...@@ -2500,7 +2500,7 @@ function upgrade_075_to_076() { ...@@ -2500,7 +2500,7 @@ function upgrade_075_to_076() {
$cron_item['month'] = "*"; $cron_item['month'] = "*";
$cron_item['wday'] = "*"; $cron_item['wday'] = "*";
$cron_item['who'] = "root"; $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; $config['cron']['item'][] = $cron_item;
} }
...@@ -2570,7 +2570,7 @@ function upgrade_080_to_081() { ...@@ -2570,7 +2570,7 @@ function upgrade_080_to_081() {
$listtags = array("ds", "v", "rra", "row"); $listtags = array("ds", "v", "rra", "row");
$rrddbpath = "/var/db/rrd/"; $rrddbpath = "/var/db/rrd/";
$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $rrdtool = "/usr/local/bin/rrdtool";
if ($g['platform'] != "pfSense") { if ($g['platform'] != "pfSense") {
/* restore the databases, if we have one */ /* restore the databases, if we have one */
...@@ -3080,7 +3080,7 @@ function upgrade_098_to_099() { ...@@ -3080,7 +3080,7 @@ function upgrade_098_to_099() {
function upgrade_099_to_100() { function upgrade_099_to_100() {
require_once("services.inc"); require_once("services.inc");
install_cron_job("/usr/bin/nice -n20 newsyslog", false); install_cron_job("newsyslog", false);
} }
function upgrade_100_to_101() { function upgrade_100_to_101() {
......
src/etc/rc
View file @ 22a3d39e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Copyright (C) 2004-2010 Scott Ullrich, All rights reserved. # Copyright (C) 2004-2010 Scott Ullrich, All rights reserved.
# Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. # Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
# Copyright (C) 2014 Franco Fichtner <franco@opnsense.org> # Copyright (C) 2014-2015 Franco Fichtner <franco@opnsense.org>
# All rights reserved. # All rights reserved.
stty status '^T' 2> /dev/null stty status '^T' 2> /dev/null
...@@ -346,7 +346,7 @@ echo "done." ...@@ -346,7 +346,7 @@ echo "done."
/usr/local/etc/rc.php_ini_setup /usr/local/etc/rc.php_ini_setup
chmod u+rx /usr/local/opnsense/service/check_reload_status.py 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 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 # let the PHP-based configuration subsystem set up the system now
......
src/etc/rc.backup_rrd.sh
View file @ 22a3d39e
...@@ -8,7 +8,7 @@ if [ -d "${RRDDBPATH}" ]; then ...@@ -8,7 +8,7 @@ if [ -d "${RRDDBPATH}" ]; then
[ -z "$NO_REMOUNT" ] && /usr/local/etc/rc.conf_mount_rw [ -z "$NO_REMOUNT" ] && /usr/local/etc/rc.conf_mount_rw
for rrdfile in "${RRDDBPATH}"/*.rrd ; do for rrdfile in "${RRDDBPATH}"/*.rrd ; do
xmlfile="${rrdfile%.rrd}.xml" xmlfile="${rrdfile%.rrd}.xml"
/usr/bin/nice -n20 /usr/local/bin/rrdtool dump "$rrdfile" "$xmlfile" /usr/local/bin/rrdtool dump "$rrdfile" "$xmlfile"
done done
cd / && tar -czf "${CF_CONF_PATH}"/rrd.tgz -C / "${RRDDBPATH#/}"/*.xml cd / && tar -czf "${CF_CONF_PATH}"/rrd.tgz -C / "${RRDDBPATH#/}"/*.xml
rm "${RRDDBPATH}"/*.xml rm "${RRDDBPATH}"/*.xml
......
src/etc/rc.firmware
View file @ 22a3d39e
...@@ -433,7 +433,7 @@ pfSenseupgrade) ...@@ -433,7 +433,7 @@ pfSenseupgrade)
ps -a | grep "check_reload_status" | awk '{print $1;}' | kill -9 ps -a | grep "check_reload_status" | awk '{print $1;}' | kill -9
echo "Installing $IMG." >> /conf/upgrade_log.txt 2>&1 echo "Installing $IMG." >> /conf/upgrade_log.txt 2>&1
cd / && /usr/bin/tar --exclude=./dev -xzUPf $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 echo "Image installed $IMG." >> /conf/upgrade_log.txt 2>&1
# process custom image if its passed # process custom image if its passed
......
src/www/diag_backup.php
View file @ 22a3d39e
...@@ -35,13 +35,14 @@ ini_set('max_input_time', '0'); ...@@ -35,13 +35,14 @@ ini_set('max_input_time', '0');
/* omit no-cache headers because it confuses IE with file downloads */ /* omit no-cache headers because it confuses IE with file downloads */
$omit_nocacheheaders = true; $omit_nocacheheaders = true;
$nocsrf = true; $nocsrf = true;
require("guiconfig.inc");
require_once("guiconfig.inc");
require_once("functions.inc"); require_once("functions.inc");
require_once("filter.inc"); require_once("filter.inc");
require_once("shaper.inc"); require_once("shaper.inc");
$rrddbpath = "/var/db/rrd"; $rrddbpath = '/var/db/rrd';
$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $rrdtool = '/usr/local/bin/rrdtool';
function rrd_data_xml() { function rrd_data_xml() {
global $rrddbpath; global $rrddbpath;
......
src/www/status_rrd_graph_img.php
View file @ 22a3d39e
...@@ -135,7 +135,7 @@ $prettydb = ucwords(str_replace($search, $replace, $curdatabase)); ...@@ -135,7 +135,7 @@ $prettydb = ucwords(str_replace($search, $replace, $curdatabase));
$rrddbpath = "/var/db/rrd/"; $rrddbpath = "/var/db/rrd/";
$rrdtmppath = "/tmp/"; $rrdtmppath = "/tmp/";
$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $rrdtool = "/usr/local/bin/rrdtool";
$uptime = "/usr/bin/uptime"; $uptime = "/usr/bin/uptime";
$sed = "/usr/bin/sed"; $sed = "/usr/bin/sed";
......
src/www/system_advanced_firewall.php
View file @ 22a3d39e
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2005-2007 Scott Ullrich Copyright (C) 2005-2007 Scott Ullrich
...@@ -186,15 +187,15 @@ if ($_POST) { ...@@ -186,15 +187,15 @@ if ($_POST) {
if ($_POST['bogonsinterval'] != $config['system']['bogons']['interval']) { if ($_POST['bogonsinterval'] != $config['system']['bogons']['interval']) {
switch ($_POST['bogonsinterval']) { switch ($_POST['bogonsinterval']) {
case 'daily': case 'daily':
install_cron_job("/usr/bin/nice -n20 /usr/local/etc/rc.update_bogons.sh", true, "1", "3", "*", "*", "*"); install_cron_job("/usr/local/etc/rc.update_bogons.sh", true, "1", "3", "*", "*", "*");
break; break;
case 'weekly': case 'weekly':
install_cron_job("/usr/bin/nice -n20 /usr/local/etc/rc.update_bogons.sh", true, "1", "3", "*", "*", "0"); install_cron_job("/usr/local/etc/rc.update_bogons.sh", true, "1", "3", "*", "*", "0");
break; break;
case 'monthly': case 'monthly':
// fall through // fall through
default: default:
install_cron_job("/usr/bin/nice -n20 /usr/local/etc/rc.update_bogons.sh", true, "1", "3", "1", "*", "*"); install_cron_job("/usr/local/etc/rc.update_bogons.sh", true, "1", "3", "1", "*", "*");
} }
$config['system']['bogons']['interval'] = $_POST['bogonsinterval']; $config['system']['bogons']['interval'] = $_POST['bogonsinterval'];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023