Make 'trace' also trace the execution of the compiled program

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3940 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-05-27 03:36:12 +00:00
parent 9ddb2933b8
commit 469c882f1d
6 changed files with 28 additions and 5 deletions

View File

@ -10,6 +10,11 @@ usage() {
################################################################################
initialize
#
# Start trace if first arg is "debug"
#
[ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
finished=0
while [ $finished -eq 0 -a $# -gt 0 ]; do

View File

@ -10,6 +10,11 @@ usage() {
################################################################################
initialize
#
# Start trace if first arg is "debug"
#
[ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
finished=0
while [ $finished -eq 0 -a $# -gt 0 ]; do

View File

@ -10,6 +10,11 @@ usage() {
################################################################################
initialize
#
# Start trace if first arg is "debug"
#
[ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
finished=0
while [ $finished -eq 0 -a $# -gt 0 ]; do

View File

@ -10,6 +10,11 @@ usage() {
################################################################################
initialize
#
# Start trace if first arg is "debug"
#
[ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
finished=0
while [ $finished -eq 0 -a $# -gt 0 ]; do

View File

@ -44,6 +44,12 @@ Problems Corrected in 3.2.0 Beta 8
ERROR: BRIDGING=Yes is required for this zone definition: loc br0:eth0
2) Previously, if LOGFORMAT generated any embedded white-space then a
startup error would result.
3) The 'trace' keyword now causes the execution of the compiled script to
be traced when the command is 'start' or 'restart'.
Other changes in 3.2.0 Beta 8
1) In /etc/shorewall/rules, the values "all-" and "all+-" may now be
@ -72,9 +78,6 @@ Other changes in 3.2.0 Beta 8
applies to "shorewall start", "shorewall restart" and "shorewall
refresh".
4) Previously, if LOGFORMAT generated any embedded white-space then a
startup error would result.
Migration Considerations:
1) If you are upgrading from Shorewall 2.x, it is essential that you read

View File

@ -512,7 +512,7 @@ start_command() {
progress_message3 "Compiling..."
if $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock compile /var/lib/shorewall/.start; then
/var/lib/shorewall/.start start
/var/lib/shorewall/.start $debugging start
fi
[ -n "$nolock" ] || mutex_off
@ -832,7 +832,7 @@ restart_command() {
progress_message3 "Compiling..."
if $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock compile /var/lib/shorewall/.restart; then
$SHOREWALL_SHELL /var/lib/shorewall/.restart restart
$SHOREWALL_SHELL /var/lib/shorewall/.restart $debugging restart
fi
[ -n "$nolock" ] || mutex_off