ctdb-scripts: Move remaining state files into CTDB_SCRIPT_VARDIR

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Jose A. Rivera <jarrpa@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/config/debug-hung-script.sh b/ctdb/config/debug-hung-script.sh
index 3f800fc55599b0b8a5a000da4a787de52c4ec739..9bde6844900751f76b7fef566a8b21d3efde4a64 100755 (executable)
--- a/ctdb/config/debug-hung-script.sh
+++ b/ctdb/config/debug-hung-script.sh
@@ -56,4 +56,4 @@ fi
        mv "$tmp" "$CTDB_DEBUG_HUNG_SCRIPT_LOGFILE"
     fi
 
-) 9>"${CTDB_VARDIR}/debug-hung-script.lock"
+) 9>"${CTDB_SCRIPT_VARDIR}/debug-hung-script.lock"

diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh
index 33bf3e63ddef3498c88280657ecbd4fcd8e51b21..3b66b6ae4fc1a42164abce1adbb528f0c2bd5261 100755 (executable)
--- a/ctdb/config/debug_locks.sh
+++ b/ctdb/config/debug_locks.sh
@@ -62,7 +62,6 @@ loadconfig ctdb
     fi
 
     echo "===== End of debug locks PID=$$ ====="
-
-) 9>"${CTDB_VARDIR}/debug_locks.lock" | script_log "ctdbd-lock"
+)9>"${CTDB_SCRIPT_VARDIR}/debug_locks.lock" | script_log "ctdbd-lock"
 
 exit 0

diff --git a/ctdb/config/functions b/ctdb/config/functions
index eabd056fdc33de7a49f662aaaf9fa31730f66335..35ccb009af8486e0fcbdd6062866535bf36458a4 100755 (executable)
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -1004,7 +1004,7 @@ iptables_wrapper ()
     fi
 
     # iptables doesn't like being re-entered, so flock-wrap it.
-    flock -w 30 "${CTDB_VARDIR}/iptables-ctdb.flock" "$_iptables_cmd" "$@"
+    flock -w 30 "${CTDB_SCRIPT_VARDIR}/iptables.flock" "$_iptables_cmd" "$@"
 }
 
 # AIX (and perhaps others?) doesn't have mktemp