From ef134da4b9fd5868ffbca768801f0b980f7450e3 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 15 Aug 2005 18:30:59 +0000 Subject: [PATCH] Make -q work with the try command git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2494 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/shorewall | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Shorewall/shorewall b/Shorewall/shorewall index d7cf3558e..42668ecde 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1055,15 +1055,16 @@ case "$1" in try) [ -n "$SHOREWALL_DIR" ] && startup_error "ERROR: -c option may not be used with \"try\"" [ $# -lt 2 -o $# -gt 3 ] && usage 1 - if ! $0 $debugging -c $2 restart; then + [ -n "$QUIET" ] && QUIET=-q + if ! $0 $debugging $QUIET -c $2 restart; then if ! $IPTABLES -L shorewall > /dev/null 2> /dev/null; then - $0 start + $0 $QUIET start fi elif ! $IPTABLES -L shorewall > /dev/null 2> /dev/null; then - $0 start + $0 $QUIET start elif [ $# -eq 3 ]; then sleep $3 - $0 restart + $0 $QUIET restart fi ;; logwatch)