More verbosity control

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3359 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

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

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
 #

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