From 2a50fd8ac8a1b02e25316ffeb856942c6b4f7c8f 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

---
 usr/local/www/diag_logs_vpn.php | 4 ++--
 usr/local/www/guiconfig.inc     | 6 +++---
 usr/local/www/status.php        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index 715eb69..d618a50 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 f1cafbd..82a4cfa 100644
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -582,7 +582,7 @@ function clear_log_file($logfile = "/var/log/system.log", $restart_syslogd = tru
 		if(isset($config['system']['usefifolog']))
 			exec("/usr/sbin/fifolog_create -s {$log_size} " . escapeshellarg($logfile));
 		else
-			exec("/usr/sbin/clog -i -s {$log_size} " . escapeshellarg($logfile));
+			exec("/usr/local/sbin/clog -i -s {$log_size} " . escapeshellarg($logfile));
 	}
 	if ($restart_syslogd)
 		system_syslogd_start();
@@ -621,7 +621,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) {
@@ -661,7 +661,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 5d374c1..5b1624a 100755
--- a/usr/local/www/status.php
+++ b/usr/local/www/status.php
@@ -187,8 +187,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");
-- 
cgit v1.1