Don't return error status on 'start' if Shorewall[-lite] is already started

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4844 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-11-11 16:20:59 +00:00
parent 98d0b4da44
commit ab51f029cc
5 changed files with 9 additions and 3 deletions

View File

@ -193,7 +193,7 @@ start_command() {
if shorewall_is_started; then if shorewall_is_started; then
error_message "Shorewall is already running" error_message "Shorewall is already running"
exit 1 exit 0
fi fi
while [ $finished -eq 0 -a $# -gt 0 ]; do while [ $finished -eq 0 -a $# -gt 0 ]; do

View File

@ -21,6 +21,8 @@ Changes in 3.3.5
10) Don't create ingress qdisc if IN-BANDWIDTH = 0. 10) Don't create ingress qdisc if IN-BANDWIDTH = 0.
11) Return success if start of running config.
Changes in 3.3.4 Changes in 3.3.4
1) Make exclusion work with "show zones" 1) Make exclusion work with "show zones"

View File

@ -67,7 +67,7 @@ case "$COMMAND" in
start) start)
if shorewall_is_started; then if shorewall_is_started; then
error_message "$PRODUCT is already Running" error_message "$PRODUCT is already Running"
status=1 status=0
else else
progress_message3 "Starting $PRODUCT...." progress_message3 "Starting $PRODUCT...."
define_firewall define_firewall

View File

@ -43,6 +43,10 @@ Problems Corrected in 3.3.5
3) Previously, a startup error resulted when white space was included 3) Previously, a startup error resulted when white space was included
in LOGFORMAT. in LOGFORMAT.
4) Previously, the "shorewall[-lite] start" command would return a
non-zero exit status if Shorewall [Lite] was already started. It
now returns an indication of success.
Other Changes in 3.3.5. Other Changes in 3.3.5.
1) Shorewall no longer includes policy matches in its generated 1) Shorewall no longer includes policy matches in its generated

View File

@ -236,7 +236,7 @@ start_command() {
if shorewall_is_started; then if shorewall_is_started; then
error_message "Shorewall is already running" error_message "Shorewall is already running"
exit 1 exit 0
fi fi
if [ -z "$STARTUP_ENABLED" ]; then if [ -z "$STARTUP_ENABLED" ]; then