From 75c148a2dd7f0a1fb20b6941cce58e562f710716 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 23 Nov 2012 11:46:14 -0800 Subject: [PATCH] Enable 'debug' on the try, stop and clear commands. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Chains.pm | 2 +- Shorewall/lib.cli-std | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index e543690dd..e7932b5c1 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -7379,7 +7379,7 @@ sub create_stop_load( $ ) { emit ''; - emit( '[ -n "$DEBUG" ] && command=debug_restore_input || command=$' . $UTILITY, + emit( '[ -n "$g_debug_iptables" ] && command=debug_restore_input || command=$' . $UTILITY, '', 'progress_message2 "Running $command..."', '', diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index 6cdf316ba..ac5a7d50c 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -1315,7 +1315,7 @@ try_command() { [ -n "$nolock" ] || mutex_on - if run_it ${VARDIR}/.$command $command && [ -n "$timeout" ]; then + if run_it ${VARDIR}/.$command $g_debugging $command && [ -n "$timeout" ]; then sleep $timeout if [ "$command" = "restart" ]; then