Simplify fix for -q

Signed-off-by: Tom Eastep <teastep@shorewall.net>
Make initial progress message obey VERBOSITY
2013-07-03 08:17:00 -07:00 · 2013-07-02 14:36:54 -07:00 · 2013-07-02 14:36:42 -07:00 · 2013-06-30 17:01:52 -07:00
4 changed files with 10 additions and 15 deletions
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@ -3369,6 +3369,7 @@ shorewall_cli() {
    g_haveconfig=
    g_conditional=
    g_file=
+    g_doing="Compiling"

    VERBOSE=
    VERBOSITY=1
--- a/Shorewall-init/shorewall-init.service
+++ b/Shorewall-init/shorewall-init.service
@ -13,8 +13,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall-init
 StandardOutput=syslog
-ExecStart=/shorewall-init $OPTIONS start
-ExecStop=/shorewall-init $OPTIONS stop
+ExecStart=/sbin/shorewall-init $OPTIONS start
+ExecStop=/sbin/shorewall-init $OPTIONS stop

 [Install]
 WantedBy=multi-user.target
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@ -1606,6 +1606,8 @@ sub Limit( $$$$ ) {

    require_capability( 'RECENT_MATCH' , 'Limit rules' , '' );

+    warning_message "The Limit action is deprecated in favor of per-IP rate limiting using the RATE LIMIT column";
+
    add_irule $chainref, recent => "--name $set --set";

    if ( $level ne '' ) {
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@ -373,6 +373,8 @@ compiler() {
    #
    get_config Yes

+    [ -n "$g_doing" ] && progress_message3 "$g_doing..."
+
    case $COMMAND in
 	*start|try|refresh)
 	    ;;
@ -471,8 +473,6 @@ start_command() {
 	    rc=$?
 	    [ -n "$nolock" ] || mutex_off
 	else
-	    progress_message3 "Compiling..."
-
 	    if compiler $g_debugging $nolock compile ${VARDIR}/.start; then
 		run_postcompile ${VARDIR}/.start
 		[ -n "$nolock" ] || mutex_on
@ -687,7 +687,7 @@ compile_command() {
 	    ;;
    esac

-    [ "x$g_file" = x- ] || progress_message3 "Compiling..."
+    [ "x$g_file" = x- ] && g_doing=''

    compiler $g_debugging compile $g_file && run_postcompile $g_file
 }
@ -766,7 +766,7 @@ check_command() {
 	    ;;
    esac

-    progress_message3 "Checking..."
+    g_doing="Checking"

    compiler $g_debugging $nolock check
 }
@ -858,7 +858,7 @@ update_command() {
 	    ;;
    esac

-    progress_message3 "Updating..."
+    g_doing="Updating..."

    compiler $g_debugging $nolock check
 }
@ -953,8 +953,6 @@ restart_command() {
    fi

    if [ -z "$g_fast" ]; then
-	progress_message3 "Compiling..."
-
 	if compiler $g_debugging $nolock compile ${VARDIR}/.restart; then
 	    run_postcompile ${VARDIR}/.restart
 	    [ -n "$nolock" ] || mutex_on
@ -1045,8 +1043,6 @@ refresh_command() {

    [ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"

-    progress_message3 "Compiling..."
-
    if compiler $g_debugging $nolock compile ${VARDIR}/.refresh; then
 	run_postcompile ${VARDIR}/.refresh
 	[ -n "$nolock" ] || mutex_on
@ -1156,8 +1152,6 @@ safe_commands() {
 	command="restart"
    fi

-    progress_message3 "Compiling..."
-
    if ! compiler $g_debugging nolock compile ${VARDIR}/.$command; then
 	status=$?
 	exit $status
@ -1289,8 +1283,6 @@ try_command() {
 	command="restart"
    fi

-    progress_message3 "Compiling..."
-
    if ! compiler $g_debugging $nolock compile ${VARDIR}/.$command; then
 	status=$?
 	exit $status
Author	SHA1	Message	Date
Tom Eastep	299e674324	Simplify fix for -q Signed-off-by: Tom Eastep <teastep@shorewall.net>	2013-07-03 08:17:00 -07:00
Tom Eastep	9dd53cd2fd	Make initial progress message obey VERBOSITY Signed-off-by: Tom Eastep <teastep@shorewall.net>	2013-07-02 14:36:54 -07:00
Tom Eastep	5daa316604	Generate a warning when Limit is invoked. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2013-07-02 14:36:42 -07:00
Tom Eastep	d09c51eeb3	Apply Togen's Shorewall-init patch. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2013-06-30 17:01:52 -07:00