diff --git a/Shorewall/compiler b/Shorewall/compiler index ec370f79d..3d438d2c4 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -64,7 +64,8 @@ startup_error() # $* = Error Message } # -# Write the passed args to $RESTOREBASE +# Write the passed args to $RESTOREBASE -- We need all of these varieties to support +# extension scripts. # save_command() { @@ -8579,7 +8580,7 @@ __EOF__ else chmod 700 $outfile - echo "Shorewall configuration compiled to $outfile" + progress_message2 "Shorewall configuration compiled to $outfile" fi rm -rf $TMP_DIR diff --git a/Shorewall/functions b/Shorewall/functions index da310c600..5eef91996 100755 --- a/Shorewall/functions +++ b/Shorewall/functions @@ -75,6 +75,11 @@ progress_message2() # $* = Message [ $VERBOSE -gt 0 ] && echo "$@" } +progress_message3() # $* = Message +{ + [ $VERBOSE -ge 0 ] && echo "$@" +} + # # Suppress all output for a command # diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 85c1ceb28..78595858e 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -877,8 +877,11 @@ reload_command() { [ -n "$nolock" ] || mutex_on + progress_message3 "Compiling..." + if $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock compile /var/lib/shorewall/.reload; then - $0 nolock $(make_verbose) restore .reload + progress_message3 "Installing..." + /var/lib/shorewall/.reload $(make_verbose) reload fi [ -n "$nolock" ] || mutex_off