summaryrefslogtreecommitdiff
path: root/ctdb/config
diff options
context:
space:
mode:
Diffstat (limited to 'ctdb/config')
-rwxr-xr-xctdb/config/ctdb-crash-cleanup.sh2
-rwxr-xr-xctdb/config/debug-hung-script.sh2
-rwxr-xr-xctdb/config/debug_locks.sh2
-rwxr-xr-xctdb/config/events.d/06.nfs2
4 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/config/ctdb-crash-cleanup.sh b/ctdb/config/ctdb-crash-cleanup.sh
index 8f4cc864566..896a90cda98 100755
--- a/ctdb/config/ctdb-crash-cleanup.sh
+++ b/ctdb/config/ctdb-crash-cleanup.sh
@@ -14,7 +14,7 @@ if service ctdb status >/dev/null 2>&1 ; then
exit 0
fi
-loadconfig
+load_script_options "failover" "11.natgw"
if [ ! -f "$CTDB_BASE/public_addresses" ] ; then
die "No public addresses file found. Can't clean up."
diff --git a/ctdb/config/debug-hung-script.sh b/ctdb/config/debug-hung-script.sh
index d6ff833a43e..03d5ea2f6a0 100755
--- a/ctdb/config/debug-hung-script.sh
+++ b/ctdb/config/debug-hung-script.sh
@@ -8,7 +8,7 @@
. "${CTDB_BASE}/functions"
-loadconfig
+load_script_options
# Testing hook
if [ -n "$CTDB_DEBUG_HUNG_SCRIPT_LOGFILE" ] ; then
diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh
index e51640bbee5..db02f0cdbaa 100755
--- a/ctdb/config/debug_locks.sh
+++ b/ctdb/config/debug_locks.sh
@@ -17,7 +17,7 @@
CTDB_DBDIR="${CTDB_VARDIR}/volatile"
CTDB_DBDIR_PERSISTENT="${CTDB_VARDIR}/persistent"
-loadconfig
+load_script_options
(
flock -n 9 || exit 1
diff --git a/ctdb/config/events.d/06.nfs b/ctdb/config/events.d/06.nfs
index 785188e5ece..4e029065ab0 100755
--- a/ctdb/config/events.d/06.nfs
+++ b/ctdb/config/events.d/06.nfs
@@ -8,7 +8,7 @@
service_name="nfs"
-load_script_options
+load_script_options "service" "60.nfs"
ctdb_setup_state_dir "service" "$service_name"