summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-04-28 11:54:22 -0300
committerRenato Botelho <garga@FreeBSD.org>2014-04-28 11:56:06 -0300
commit2db29614d2bba183084af426bef18428178f6dee (patch)
tree587aecec0fd80e32c0a2b75d4ea6de703458d960 /usr/local
parentdc5c69f1228f66dce031f1300ae8ed48485d73d9 (diff)
downloadpfsense-2db29614d2bba183084af426bef18428178f6dee.zip
pfsense-2db29614d2bba183084af426bef18428178f6dee.tar.gz
Move clog from /usr to /usr/local
Conflicts: etc/inc/filter_log.inc etc/inc/system.inc etc/rc usr/local/www/guiconfig.inc
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/diag_logs_vpn.php4
-rwxr-xr-xusr/local/www/guiconfig.inc6
-rwxr-xr-xusr/local/www/status.php4
3 files changed, 7 insertions, 7 deletions
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index 70ca4ac..61d467c 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -30,7 +30,7 @@
*/
/*
- pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/sbin/clog
+ pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/local/sbin/clog
pfSense_MODULE: vpn
*/
@@ -92,7 +92,7 @@ function dump_clog_vpn($logfile, $tail) {
if(isset($config['system']['usefifolog']))
exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
else
- exec("/usr/sbin/clog " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
+ exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
foreach ($logarr as $logent) {
$logent = preg_split("/\s+/", $logent, 6);
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 8cb2d9f..77a1f0d 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -581,7 +581,7 @@ function clear_log_file($logfile = "/var/log/system.log") {
if(isset($config['system']['usefifolog']))
exec("/usr/sbin/fifolog_create -s 511488 " . escapeshellarg($logfile));
else
- exec("/usr/sbin/clog -i -s 511488 " . escapeshellarg($logfile));
+ exec("/usr/local/sbin/clog -i -s 511488 " . escapeshellarg($logfile));
}
system_syslogd_start();
}
@@ -604,7 +604,7 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
if(isset($config['system']['usefifolog']))
exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
else
- exec("/usr/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
+ exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
}
}
foreach ($logarr as $logent) {
@@ -644,7 +644,7 @@ function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinve
if(isset($config['system']['usefifolog'])) {
exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
} else {
- exec("/usr/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
+ exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
}
}
return($logarr);
diff --git a/usr/local/www/status.php b/usr/local/www/status.php
index a4906cf..625dd42 100755
--- a/usr/local/www/status.php
+++ b/usr/local/www/status.php
@@ -186,8 +186,8 @@ if(isset($config['system']['usefifolog'])) {
defCmdT("last 200 system log entries","/usr/sbin/fifolog_reader /var/log/system.log 2>&1 | tail -n 200");
defCmdT("last 50 filter log entries","/usr/sbin/fifolog_reader /var/log/filter.log 2>&1 | tail -n 50");
} else {
- defCmdT("last 200 system log entries","/usr/sbin/clog /var/log/system.log 2>&1 | tail -n 200");
- defCmdT("last 50 filter log entries","/usr/sbin/clog /var/log/filter.log 2>&1 | tail -n 50");
+ defCmdT("last 200 system log entries","/usr/local/sbin/clog /var/log/system.log 2>&1 | tail -n 200");
+ defCmdT("last 50 filter log entries","/usr/local/sbin/clog /var/log/filter.log 2>&1 | tail -n 50");
}
defCmd("ls /conf");
OpenPOWER on IntegriCloud