Syncronize shorewall-lite activities

Conflicts:

	Shorewall-lite/shorewall-lite
	Shorewall6-lite/shorewall6-lite

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-07-22 16:00:34 -08:00
parent a982a29a5c
commit 8b8a297798
5 changed files with 22 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 $@

View File

@ -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