From b1e963f63f73a6e5186cd09b1551dcc2190abff6 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 2 Oct 2010 07:47:38 -0700 Subject: [PATCH] Fix log reading in the -lite packages Signed-off-by: Tom Eastep --- Shorewall-lite/shorewall-lite | 5 +++-- Shorewall6-lite/shorewall6-lite | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 85e4e5e79..e73624d01 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -94,9 +94,9 @@ get_config() { [ -z "$LOGFILE" ] && LOGFILE=/var/log/messages if ( ps ax 2> /dev/null | grep -v grep | qt grep 'syslogd.*-C' ) ; then - LOGREAD="logread | tac" + g_logread="logread | tac" elif [ -r $LOGFILE ]; then - LOGREAD="tac $LOGFILE" + g_logread="tac $LOGFILE" else echo "LOGFILE ($LOGFILE) does not exist!" >&2 exit 2 @@ -469,6 +469,7 @@ g_use_verbosity= g_noroutes= g_timestamp= g_recovering= +g_logread= finished=0 diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite index 541cce77b..54777618d 100755 --- a/Shorewall6-lite/shorewall6-lite +++ b/Shorewall6-lite/shorewall6-lite @@ -94,9 +94,9 @@ get_config() { [ -z "$LOGFILE" ] && LOGFILE=/var/log/messages if ( ps ax 2> /dev/null | grep -v grep | qt grep 'syslogd.*-C' ) ; then - LOGREAD="logread | tac" + g_logread="logread | tac" elif [ -r $LOGFILE ]; then - LOGREAD="tac $LOGFILE" + g_logread="tac $LOGFILE" else echo "LOGFILE ($LOGFILE) does not exist!" >&2 exit 2 @@ -453,6 +453,7 @@ g_noroutes= g_timestamp= g_recovering= g_purge= +g_logread= finished=0