diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 600db46ad..d034cea38 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -193,7 +193,7 @@ start_command() { if shorewall_is_started; then error_message "Shorewall is already running" - exit 1 + exit 0 fi while [ $finished -eq 0 -a $# -gt 0 ]; do diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 52203c459..053f802c4 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -21,6 +21,8 @@ Changes in 3.3.5 10) Don't create ingress qdisc if IN-BANDWIDTH = 0. +11) Return success if start of running config. + Changes in 3.3.4 1) Make exclusion work with "show zones" diff --git a/Shorewall/prog.footer b/Shorewall/prog.footer index ba59d492c..a92846bb1 100644 --- a/Shorewall/prog.footer +++ b/Shorewall/prog.footer @@ -67,7 +67,7 @@ case "$COMMAND" in start) if shorewall_is_started; then error_message "$PRODUCT is already Running" - status=1 + status=0 else progress_message3 "Starting $PRODUCT...." define_firewall diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index ace373478..1c1737c1e 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -43,6 +43,10 @@ Problems Corrected in 3.3.5 3) Previously, a startup error resulted when white space was included 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. 1) Shorewall no longer includes policy matches in its generated diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 5ff20ebce..4ac5d992b 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -236,7 +236,7 @@ start_command() { if shorewall_is_started; then error_message "Shorewall is already running" - exit 1 + exit 0 fi if [ -z "$STARTUP_ENABLED" ]; then