diff --git a/Shorewall/compiler b/Shorewall/compiler index 06f9268c9..bb84e2457 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -8662,7 +8662,7 @@ __EOF__ INDENT= cat $(find_file prog.header${DISTRIBUTION}) $OUTPUT $(find_file prog.footer${DISTRIBUTION}) > $outfile chmod 700 $outfile - progress_message2 "Shorewall configuration compiled to $outfile" + progress_message3 "Shorewall configuration compiled to $outfile" rm -f $OUTPUT fi diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 1db511ccc..eea984f34 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -299,7 +299,8 @@ file> shorewall.conf. If you don't set it (as would be the case of you use your old shorewall.conf file) then VERBOSITY defaults to a value of 2 which is the old default. A value of 1 suppresses some of the output (like the old - -q option did) while a value of 0 makes Shorewall almost silent. + -q option did) while a value of 0 makes Shorewall almost silent. A value + of -1 suppresses all output except warning and error messages. The value specified in the 3.2 shorewall.conf is 1. So you can make Shorewall as verbose as previously using a single -v and you can make it @@ -312,7 +313,7 @@ file> to VERBOSITY. The "shorewall show log", "shorewall logwatch" and "shorewall dump" - commands require VERBOSE to be greater than or equal to 3 to display MAC + commands require VERBOSITY 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 VERBOSITY=0 in shorewall.conf, then you will need to include -vvv in diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 51b2d3563..213971b98 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -678,6 +678,8 @@ compile_command() { export EXPORT + progress_message3 "Compiling..." + exec $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging compile $file } # @@ -739,6 +741,8 @@ check_command() { export NOROUTES + progress_message3 "Checking..." + exec $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock check } @@ -1133,6 +1137,8 @@ safe_commands() { command="restart" fi + progress_message3 "Compiling..." + if ! $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging nolock compile /var/lib/shorewall/.$command; then status=$? mutex_off @@ -1144,6 +1150,15 @@ safe_commands() { save_config + case $command in + start) + progress_message3 "Starting..." + ;; + restart) + progress_message3 "Restarting..." + ;; + esac + /var/lib/shorewall/.$command $command echo -n "Do you want to accept the new firewall configuration? [y/n] " @@ -1227,7 +1242,7 @@ restore_command() { ${RESTOREPATH}-ipsets fi - echo Restoring Shorewall... + progress_message3 "Restoring Shorewall..." $RESTOREPATH restore && echo "Shorewall restored from /var/lib/shorewall/$RESTOREFILE" [ -n "$nolock" ] || mutex_off else