Repair -v brain damage

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3371 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-01-24 16:10:41 +00:00
parent 0ad4ee536d
commit 33cc957521
3 changed files with 12 additions and 9 deletions

View File

@ -49,9 +49,12 @@ New Features added in 3.1.4
You set the default level of verbosity using the VERBOSE option in You set the default level of verbosity using the VERBOSE option in
shorewall.conf. If you don't set it (as would be the case of you use your shorewall.conf. If you don't set it (as would be the case of you use your
old shorewall.conf file) then VERBOSE defaults to a value of 2 which is old shorewall.conf file) then VERBOSE defaults to a value of 2 which is
the old default. A value of 1 supporesses some of the output (like the old 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. That is -q option did) while a value of 0 makes Shorewall almost silent.
the value specified in the 3.2 shorewall.conf
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 silent by using
a single -1.
If the default is set at 2, you can still make a command silent by using two If the default is set at 2, you can still make a command silent by using two
"q"s (e.g., shorewall -qq restart). "q"s (e.g., shorewall -qq restart).

View File

@ -935,7 +935,7 @@ show_command() {
;; ;;
v*) v*)
VERBOSE=$(($VERBOSE + 1 )) VERBOSE=$(($VERBOSE + 1 ))
option=${option#q} option=${option#v}
;; ;;
*) *)
usage 1 usage 1
@ -1072,7 +1072,7 @@ dump_command() {
;; ;;
v*) v*)
VERBOSE=$(($VERBOSE + 1 )) VERBOSE=$(($VERBOSE + 1 ))
option=${option#q} option=${option#v}
;; ;;
*) *)
usage 1 usage 1
@ -1545,7 +1545,7 @@ while [ $finished -eq 0 ]; do
;; ;;
v*) v*)
VERBOSE=$(($VERBOSE + 1 )) VERBOSE=$(($VERBOSE + 1 ))
option=${option#q} option=${option#v}
;; ;;
n*) n*)
NOROUTES=Yes NOROUTES=Yes
@ -1811,7 +1811,7 @@ case "$COMMAND" in
case $option in case $option in
v*) v*)
VERBOSE=$(($VERBOSE + 1 )) VERBOSE=$(($VERBOSE + 1 ))
option=${option#q} option=${option#v}
;; ;;
-) -)
finished=1 finished=1

View File

@ -68,9 +68,9 @@ STARTUP_ENABLED=No
# 1 -- Major progress messages displayed # 1 -- Major progress messages displayed
# 2 -- All progress messages displayed (old default behavior) # 2 -- All progress messages displayed (old default behavior)
# #
# If not specified, the 2 is assumed # If not specified, then 2 is assumed
VERBOSE=0 VERBOSE=1
############################################################################### ###############################################################################
# L O G G I N G # L O G G I N G