diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-04-04 19:16:57 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-05-12 06:11:17 +0200 |
| commit | ac1c12b5a21ed2666478817b377acf8f5aa48644 (patch) | |
| tree | 1154e0d0627c49dab9ded8be8bd763e5c9d8ed57 /ctdb/config | |
| parent | 02444e5f479f2d9705de93006916d9cd1333f21c (diff) | |
| download | samba-ac1c12b5a21ed2666478817b377acf8f5aa48644.tar.gz | |
ctdb-scripts: Use load_script_options() in miscellaneous scripts
Some of these just aim to load the generic script.options file while
others target more specific files.
For NFS configuration, always use 60.nfs.options - even for 06.nfs.
This could be carefully documented but will change a lot before
release so there is no need.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/config')
| -rwxr-xr-x | ctdb/config/ctdb-crash-cleanup.sh | 2 | ||||
| -rwxr-xr-x | ctdb/config/debug-hung-script.sh | 2 | ||||
| -rwxr-xr-x | ctdb/config/debug_locks.sh | 2 | ||||
| -rwxr-xr-x | ctdb/config/events.d/06.nfs | 2 |
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" |