holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

rename not_configured() to not_configured_error()

Browse Source 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
This commit is contained in:
Tuomo Soini 2015-06-09 20:29:45 +03:00 committed by Tom Eastep
parent e10c078a06
commit f175ab853b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-core/lib.common
View File

@ -82,7 +82,7 @@ fatal_error() # $@ = Message
# #
# Not configured Error # Not configured Error
# #
not_configured() # $@ = Message not_configured_error() # $@ = Message
{ {
echo " ERROR: $@" >&2 echo " ERROR: $@" >&2
exit 6 exit 6

14
Shorewall/lib.cli-std
View File

@ -162,13 +162,13 @@ get_config() {
if [ "$2" = Yes ]; then if [ "$2" = Yes ]; then
case $STARTUP_ENABLED in case $STARTUP_ENABLED in
No|no|NO) 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) Yes|yes|YES)
;; ;;
*) *)
if [ -n "$STARTUP_ENABLED" ]; then 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 fi
;; ;;
esac esac
@ -496,7 +496,7 @@ start_command() {
exit 0 exit 0
fi 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 while [ $finished -eq 0 -a $# -gt 0 ]; do
option=$1 option=$1
@ -988,7 +988,7 @@ restart_command() {
;; ;;
esac 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 if [ -z "$g_fast" -a -n "$AUTOMAKE" ]; then
uptodate ${VARDIR}/firewall && g_fast=Yes uptodate ${VARDIR}/firewall && g_fast=Yes
@ -1087,7 +1087,7 @@ refresh_command() {
product_is_started || fatal_error "$g_product is not running" 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 if compiler $g_debugging $nolock compile ${VARDIR}/.refresh; then
run_postcompile ${VARDIR}/.refresh run_postcompile ${VARDIR}/.refresh
@ -1176,7 +1176,7 @@ safe_commands() {
;; ;;
esac esac
[ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled" [ -n "$STARTUP_ENABLED" ] || not_configured_error "Startup is disabled"
if product_is_started; then if product_is_started; then
running=Yes running=Yes
@ -1313,7 +1313,7 @@ try_command() {
;; ;;
esac esac
[ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled" [ -n "$STARTUP_ENABLED" ] || not_configured_error "Startup is disabled"
if product_is_started; then if product_is_started; then
running=Yes running=Yes