extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-24 15:18:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

More verbosity changes

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3429 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-02-03 21:39:00 +00:00
parent 688983eafa
commit 23b4d140f1
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/compiler
View File

@ -8662,7 +8662,7 @@ __EOF__
INDENT= INDENT=
cat $(find_file prog.header${DISTRIBUTION}) $OUTPUT $(find_file prog.footer${DISTRIBUTION}) > $outfile cat $(find_file prog.header${DISTRIBUTION}) $OUTPUT $(find_file prog.footer${DISTRIBUTION}) > $outfile
chmod 700 $outfile chmod 700 $outfile
progress_message2 "Shorewall configuration compiled to $outfile" progress_message3 "Shorewall configuration compiled to $outfile"
rm -f $OUTPUT rm -f $OUTPUT
fi fi

5
Shorewall/releasenotes.txt
View File

@ -299,7 +299,8 @@ file>
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 VERBOSITY defaults to a value of 2 which is old shorewall.conf file) then VERBOSITY defaults to a value of 2 which is
the old default. A value of 1 suppresses 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. -q option did) while a value of 0 makes Shorewall almost silent. A value
of -1 suppresses all output except warning and error messages.
The value specified in the 3.2 shorewall.conf is 1. So you can make 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 Shorewall as verbose as previously using a single -v and you can make it
@ -312,7 +313,7 @@ file>
to VERBOSITY. to VERBOSITY.
The "shorewall show log", "shorewall logwatch" and "shorewall dump" The "shorewall show log", "shorewall logwatch" and "shorewall dump"
commands require VERBOSE to be greater than or equal to 3 to display MAC commands require VERBOSITY to be greater than or equal to 3 to display MAC
addresses.This is consistent with the previous implementation which addresses.This is consistent with the previous implementation which
required a single -v to enable MAC display but means that if you set required a single -v to enable MAC display but means that if you set
VERBOSITY=0 in shorewall.conf, then you will need to include -vvv in VERBOSITY=0 in shorewall.conf, then you will need to include -vvv in

17
Shorewall/shorewall
View File

@ -678,6 +678,8 @@ compile_command() {
export EXPORT export EXPORT
progress_message3 "Compiling..."
exec $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging compile $file exec $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging compile $file
} }
# #
@ -739,6 +741,8 @@ check_command() {
export NOROUTES export NOROUTES
progress_message3 "Checking..."
exec $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock check exec $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock check
} }
@ -1133,6 +1137,8 @@ safe_commands() {
command="restart" command="restart"
fi fi
progress_message3 "Compiling..."
if ! $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging nolock compile /var/lib/shorewall/.$command; then if ! $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging nolock compile /var/lib/shorewall/.$command; then
status=$? status=$?
mutex_off mutex_off
@ -1144,6 +1150,15 @@ safe_commands() {
save_config save_config
case $command in
start)
progress_message3 "Starting..."
;;
restart)
progress_message3 "Restarting..."
;;
esac
/var/lib/shorewall/.$command $command /var/lib/shorewall/.$command $command
echo -n "Do you want to accept the new firewall configuration? [y/n] " echo -n "Do you want to accept the new firewall configuration? [y/n] "
@ -1227,7 +1242,7 @@ restore_command() {
${RESTOREPATH}-ipsets ${RESTOREPATH}-ipsets
fi fi
echo Restoring Shorewall... progress_message3 "Restoring Shorewall..."
$RESTOREPATH restore && echo "Shorewall restored from /var/lib/shorewall/$RESTOREFILE" $RESTOREPATH restore && echo "Shorewall restored from /var/lib/shorewall/$RESTOREFILE"
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
else else