diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common index 3fbe95f83..28b0d5356 100644 --- a/Shorewall-core/lib.common +++ b/Shorewall-core/lib.common @@ -82,7 +82,7 @@ fatal_error() # $@ = Message # # Not configured Error # -not_configured() # $@ = Message +not_configured_error() # $@ = Message { echo " ERROR: $@" >&2 exit 6 diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index bdff92a91..b2987e5c7 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -162,13 +162,13 @@ get_config() { if [ "$2" = Yes ]; then case $STARTUP_ENABLED in No|no|NO) - not_configured "$g_product startup is disabled. To enable startup, set STARTUP_ENABLED=Yes in ${g_confdir}/${g_program}.conf" + not_configured_error "$g_product startup is disabled. To enable startup, set STARTUP_ENABLED=Yes in ${g_confdir}/${g_program}.conf" ;; Yes|yes|YES) ;; *) if [ -n "$STARTUP_ENABLED" ]; then - not_configured "Invalid Value for STARTUP_ENABLED: $STARTUP_ENABLED" + not_configured_error "Invalid Value for STARTUP_ENABLED: $STARTUP_ENABLED" fi ;; esac @@ -509,7 +509,7 @@ start_command() { exit 0 fi - [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled" + [ -n "$STARTUP_ENABLED" ] || not_configured_error "Startup is disabled" while [ $finished -eq 0 -a $# -gt 0 ]; do option=$1 @@ -1001,7 +1001,7 @@ restart_command() { ;; esac - [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled" + [ -n "$STARTUP_ENABLED" ] || not_configured_error "Startup is disabled" if [ -z "$g_fast" -a -n "$AUTOMAKE" ]; then uptodate ${VARDIR}/firewall && g_fast=Yes @@ -1100,7 +1100,7 @@ refresh_command() { product_is_started || fatal_error "$g_product is not running" - [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled" + [ -n "$STARTUP_ENABLED" ] || not_configured_error "Startup is disabled" if compiler $g_debugging $nolock compile ${VARDIR}/.refresh; then run_postcompile ${VARDIR}/.refresh @@ -1189,7 +1189,7 @@ safe_commands() { ;; esac - [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled" + [ -n "$STARTUP_ENABLED" ] || not_configured_error "Startup is disabled" if product_is_started; then running=Yes @@ -1326,7 +1326,7 @@ try_command() { ;; esac - [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled" + [ -n "$STARTUP_ENABLED" ] || not_configured_error "Startup is disabled" if product_is_started; then running=Yes