diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-04-28 11:54:22 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-04-28 11:56:06 -0300 |
commit | 2db29614d2bba183084af426bef18428178f6dee (patch) | |
tree | 587aecec0fd80e32c0a2b75d4ea6de703458d960 /etc/inc | |
parent | dc5c69f1228f66dce031f1300ae8ed48485d73d9 (diff) | |
download | pfsense-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 'etc/inc')
-rw-r--r-- | etc/inc/filter_log.inc | 4 | ||||
-rw-r--r-- | etc/inc/system.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/filter_log.inc b/etc/inc/filter_log.inc index cb13b51..c7ee997 100644 --- a/etc/inc/filter_log.inc +++ b/etc/inc/filter_log.inc @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ /* - pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/bin/tail /usr/sbin/clog + pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/bin/tail /usr/local/sbin/clog pfSense_MODULE: filter */ @@ -57,7 +57,7 @@ function conv_log_filter($logfile, $nentries, $tail = 50, $filtertext = "", $fil if(isset($config['system']['usefifolog'])) exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . " | /usr/bin/tail -r -n {$tail}", $logarr); else - exec("/usr/sbin/clog " . escapeshellarg($logfile) . " | grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -r -n {$tail}", $logarr); + exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . " | grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -r -n {$tail}", $logarr); $filterlog = array(); $counter = 0; diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 0924c3c..108f86b 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -578,7 +578,7 @@ function system_syslogd_start() { } else { // Defaults to CLOG $log_directive = "%"; $log_size = "10240"; - $log_create_directive = "/usr/sbin/clog -i -s "; + $log_create_directive = "/usr/local/sbin/clog -i -s "; } if (isset($syslogcfg)) { |