From 8b8a2977980417ec98e002159f17e53bafb33ed9 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 22 Jul 2010 16:00:34 -0800 Subject: [PATCH] Syncronize shorewall-lite activities Conflicts: Shorewall-lite/shorewall-lite Shorewall6-lite/shorewall6-lite Signed-off-by: Tom Eastep --- Shorewall-init/ifupdown.sh | 2 +- Shorewall-lite/shorewall-lite | 5 +++++ Shorewall/shorewall | 6 ++++++ Shorewall6-lite/shorewall6-lite | 5 +++++ Shorewall6/shorewall6 | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Shorewall-init/ifupdown.sh b/Shorewall-init/ifupdown.sh index 8d832bf56..1f243e198 100644 --- a/Shorewall-init/ifupdown.sh +++ b/Shorewall-init/ifupdown.sh @@ -93,7 +93,7 @@ for PRODUCT in $PRODUCTS; do VARDIR=/var/lib/$PRODUCT [ -f /etc/$PRODUCT/vardir ] && . /etc/$PRODUCT/vardir if [ -x $VARDIR/firewall ]; then - $VARDIR/firewall -V0 $COMMAND $IFACE + /sbin/$PRODUCT -v0 $COMMAND $IFACE fi done diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index df190fe97..9f017b5be 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -635,6 +635,11 @@ case "$COMMAND" in run_it $g_firewall $debugging $COMMAND [ -n "$nolock" ] || mutex_off ;; + up|down) + [ -n "$nolock" ] || mutex_on + run_it $g_firewall $debugging $COMMAND + [ -n "$nolock" ] || mutex_off + ;; reset) verify_firewall_script [ -n "$nolock" ] || mutex_on diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 7485d5e94..0eb0bd915 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1635,6 +1635,12 @@ case "$COMMAND" in run_it $g_firewall $g_debugging $COMMAND [ -n "$nolock" ] || mutex_off ;; + up|down) + [ -x $g_firewall ] || fatal_error "Shorewall has never been started" + mutex_on + run_it $g_firewall $g_debugging $nolock $@ + mutex_off + ;; reset) get_config shift diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite index ba7ca2da9..951b6867c 100755 --- a/Shorewall6-lite/shorewall6-lite +++ b/Shorewall6-lite/shorewall6-lite @@ -619,6 +619,11 @@ case "$COMMAND" in run_it $g_firewall $debugging $COMMAND [ -n "$nolock" ] || mutex_off ;; + up|down) + [ -n "$nolock" ] || mutex_on + run_it $g_firewall $debugging $@ + [ -n "$nolock" ] || mutex_off + ;; restart) shift restart_command $@ diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index ab32081f1..fb2e55193 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -1548,6 +1548,11 @@ case "$COMMAND" in run_it $g_firewall $g_debugging $COMMAND [ -n "$nolock" ] || mutex_off ;; + up|down) + mutex_on + run_it $g_firewall $g_debugging $nolock $@ + mutex_off + ;; reset) get_config shift