mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-09 15:18:12 +01:00
Fix exit status on start/restart commands
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4602 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
c66522e672
commit
4a4c9a9c67
@ -481,15 +481,19 @@ start_command() {
|
|||||||
local finished=0
|
local finished=0
|
||||||
|
|
||||||
do_it() {
|
do_it() {
|
||||||
|
local rc=0
|
||||||
[ -n "$nolock" ] || mutex_on
|
[ -n "$nolock" ] || mutex_on
|
||||||
|
|
||||||
if [ -x ${LITEDIR}/firewall ]; then
|
if [ -x ${LITEDIR}/firewall ]; then
|
||||||
${LITEDIR}/firewall $debugging start
|
${LITEDIR}/firewall $debugging start
|
||||||
|
rc=$?
|
||||||
else
|
else
|
||||||
error_message "${LITEDIR}/firewall is missing or is not executable"
|
error_message "${LITEDIR}/firewall is missing or is not executable"
|
||||||
|
rc=2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -n "$nolock" ] || mutex_off
|
[ -n "$nolock" ] || mutex_off
|
||||||
|
exit $rc
|
||||||
}
|
}
|
||||||
|
|
||||||
verify_firewall_script
|
verify_firewall_script
|
||||||
@ -595,7 +599,7 @@ start_command() {
|
|||||||
# Restart Command Executor
|
# Restart Command Executor
|
||||||
#
|
#
|
||||||
restart_command() {
|
restart_command() {
|
||||||
local finished=0
|
local finished=0 rc=0
|
||||||
|
|
||||||
verify_firewall_script
|
verify_firewall_script
|
||||||
|
|
||||||
@ -656,11 +660,14 @@ restart_command() {
|
|||||||
|
|
||||||
if [ -x ${LITEDIR}/firewall ]; then
|
if [ -x ${LITEDIR}/firewall ]; then
|
||||||
$SHOREWALL_SHELL ${LITEDIR}/firewall $debugging restart
|
$SHOREWALL_SHELL ${LITEDIR}/firewall $debugging restart
|
||||||
|
rc=$?
|
||||||
else
|
else
|
||||||
error_message "${LITEDIR}/firewall is missing or is not executable"
|
error_message "${LITEDIR}/firewall is missing or is not executable"
|
||||||
|
rc=2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -n "$nolock" ] || mutex_off
|
[ -n "$nolock" ] || mutex_off
|
||||||
|
return $rc
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user