From 56b178e1a2109a2dca52e2140db060bd091b1458 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Fri, 22 Jan 2010 17:19:12 +1100
Subject: eventscripts: stop loadconfig function from loading ctdb config file
 twice.

If "$1" was empty than loadconfig would load the ctdb config twice.
This stops that from happening.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 0406d406da70aaee7ad6aac236114905c5d03ed2)
---
 ctdb/config/functions | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'ctdb')

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
-- 
cgit