Syncronize shorewall-lite activities

Conflicts:

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

Signed-off-by: Tom Eastep <teastep@shorewall.net>

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
 

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

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

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

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