From db518e17610174a0cd0cd3d2aa3f326c7ca103bf Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 24 Jan 2006 16:15:27 +0000 Subject: [PATCH] More verbosity tweaks -- default for new users is now VERBOSE=1 git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3372 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/releasenotes.txt | 7 +++++++ Shorewall/shorewall | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 32a32eac8..f3705e208 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -62,6 +62,13 @@ New Features added in 3.1.4 In summary, each "q" subtracts one from VERBOSE while each "v" adds one to VERBOSE. + The "shorewall show log", "shorewall logwatch" and "shorewall dump" commands + require VERBOSE to be greater than or equal to 3 to display MAC addresses. + This is consistent with the previous implementation which required a single + -v to enable MAC display but means that if you set VERBOSE=0 in shorewall.conf, + then you will need to include -vvv in these commands in order to have MACs + displayed. + Migration Considerations: None. diff --git a/Shorewall/shorewall b/Shorewall/shorewall index adbe202f5..2e7e33cf7 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -281,7 +281,7 @@ packet_log() # $1 = number of messages [ -n "$realtail" ] && options="-n$1" - if [ $VERBOSE -gt 1 ]; then + if [ $VERBOSE -gt 2 ]; then grep "${LOGFORMAT}" $LOGFILE | \ sed s/" kernel:"// | \ sed s/" $host $LOGFORMAT"/" "/ | \