summaryrefslogtreecommitdiffstats
path: root/ctdb/config/functions
diff options
context:
space:
mode:
Diffstat (limited to 'ctdb/config/functions')
-rw-r--r--ctdb/config/functions7
1 files changed, 3 insertions, 4 deletions
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 32d6d98ac5..531f85937d 100644
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -6,17 +6,16 @@ PATH=/bin:/usr/bin:/usr/sbin:/sbin:$PATH
# pull in a system config file, if any
loadconfig() {
- if [ "$1" != "ctdb" ] ; then
- loadconfig "ctdb"
- fi
-
if [ -z "$1" ] ; then
foo="${service_config:-${service_name}}"
if [ -n "$foo" ] ; then
loadconfig "$foo"
fi
+ elif [ "$1" != "ctdb" ] ; then
+ loadconfig "ctdb"
fi
+
if [ -f /etc/sysconfig/$1 ]; then
. /etc/sysconfig/$1
elif [ -f /etc/default/$1 ]; then