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 a63e29217..97cbe9e55 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -631,7 +631,14 @@ case "$COMMAND" in stop|clear) [ $# -ne 1 ] && usage 1 verify_firewall_script + [ -n "$nolock" ] || mutex_on run_it $g_firewall $debugging $nolock $COMMAND + [ -n "$nolock" ] || mutex_off + ;; + up|down) + [ -n "$nolock" ] || mutex_on + run_it $g_firewall $debugging $nolock $COMMAND + [ -n "$nolock" ] || mutex_off ;; reset) verify_firewall_script diff --git a/Shorewall/shorewall b/Shorewall/shorewall index bab9a9bc4..b6c80ed76 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1635,6 +1635,12 @@ case "$COMMAND" in run_it $g_firewall $g_debugging $nolock $COMMAND 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 89a36c505..7e123cac7 100755 --- a/Shorewall6-lite/shorewall6-lite +++ b/Shorewall6-lite/shorewall6-lite @@ -615,7 +615,14 @@ case "$COMMAND" in stop|reset|clear) [ $# -ne 1 ] && usage 1 verify_firewall_script + [ -n "$nolock" ] || mutex_on run_it $g_firewall $debugging $nolock $COMMAND + [ -n "$nolock" ] || mutex_off + ;; + up|down) + [ -n "$nolock" ] || mutex_on + run_it $g_firewall $debugging $nolock $@ + [ -n "$nolock" ] || mutex_off ;; restart) shift diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index c1f3e23a4..0dc423115 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -1548,6 +1548,11 @@ case "$COMMAND" in run_it $g_firewall $g_debugging $nolock $COMMAND mutex_off ;; + up|down) + mutex_on + run_it $g_firewall $g_debugging $nolock $@ + mutex_off + ;; reset) get_config shift