summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2010-08-31 17:40:40 +1000
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2010-11-17 11:46:48 +1100
commit8fe1ec37543fe88590feebcb87ad9614b25a3251 (patch)
tree6620be10fa0ce0b913bdbaf61b3825b57ef837c4
parente23ca7dba563ff2d3c024f2e9a68b956a0ab0ee2 (diff)
downloadsamba-8fe1ec37543fe88590feebcb87ad9614b25a3251.tar.gz
samba-8fe1ec37543fe88590feebcb87ad9614b25a3251.tar.xz
samba-8fe1ec37543fe88590feebcb87ad9614b25a3251.zip
Eventscripts: make loadconfig() function hookable by the test suite.
Rename loadconfig() to _loadconfig(). Add a new loadconfig() that simply calls _loadconfig(). This makes it easy for the test suite to override loadconfig(). Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit 1d77a3adfff893b3c01b87f791e72c0d3148425c)
-rwxr-xr-xctdb/config/functions6
1 files changed, 5 insertions, 1 deletions
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 854060a664..610085b677 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin:/usr/sbin:/sbin:$PATH
#######################################
# pull in a system config file, if any
-loadconfig() {
+_loadconfig() {
if [ -z "$1" ] ; then
foo="${service_config:-${service_name}}"
@@ -25,6 +25,10 @@ loadconfig() {
fi
}
+loadconfig () {
+ _loadconfig "$@"
+}
+
##############################################################
# determine on what type of system (init style) we are running
detect_init_style() {