From 2db29614d2bba183084af426bef18428178f6dee Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 28 Apr 2014 11:54:22 -0300
Subject: Move clog from /usr to /usr/local

Conflicts:
	etc/inc/filter_log.inc
	etc/inc/system.inc
	etc/rc
	usr/local/www/guiconfig.inc
---
 etc/inc/filter_log.inc | 4 ++--
 etc/inc/system.inc     | 2 +-
 etc/rc                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'etc')

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)) {
diff --git a/etc/rc b/etc/rc
index 7dc442c..2be059f 100755
--- a/etc/rc
+++ b/etc/rc
@@ -287,7 +287,7 @@ for logfile in $LOG_FILES; do
 				# generate fifolog files
 				/usr/sbin/fifolog_create -s 511488 /var/log/$logfile.log
 			else 
-				/usr/sbin/clog -i -s 512144 /var/log/$logfile.log
+				/usr/local/sbin/clog -i -s 512144 /var/log/$logfile.log
 			fi
 		fi
 	fi 
-- 
cgit v1.1