From 05f9f926c4b52a3dfc260dfb9ae786117dddca8b Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 21 Aug 2015 14:19:20 -0700 Subject: [PATCH] Move fatal_error() to lib.base Signed-off-by: Tom Eastep Conflicts: Shorewall-core/lib.common --- Shorewall-core/lib.base | 18 ++++++++++++++++++ Shorewall-core/lib.common | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Shorewall-core/lib.base b/Shorewall-core/lib.base index 602e1c3b6..33f79dcb3 100644 --- a/Shorewall-core/lib.base +++ b/Shorewall-core/lib.base @@ -75,6 +75,24 @@ elif [ -z "${VARDIR}" ]; then VARDIR="${VARLIB}/${PRODUCT}" fi +# +# Fatal Error +# +fatal_error() # $@ = Message +{ + echo " ERROR: $@" >&2 + exit 2 +} + +# +# Not configured Error +# +not_configured_error() # $@ = Message +{ + echo " ERROR: $@" >&2 + exit 6 +} + # # Conditionally produce message # diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common index e1d29ae64..a61bfcd03 100644 --- a/Shorewall-core/lib.common +++ b/Shorewall-core/lib.common @@ -70,24 +70,6 @@ startup_error() # $* = Error Message exit 2 } -# -# Fatal Error -# -fatal_error() # $@ = Message -{ - echo " ERROR: $@" >&2 - exit 2 -} - -# -# Not configured Error -# -not_configured_error() # $@ = Message -{ - echo " ERROR: $@" >&2 - exit 6 -} - # # Get the Shorewall version of the passed script #