From: Martin Schwenke <martin@meltin.net>
Date: Thu, 19 Apr 2018 11:57:07 +0000 (+1000)
Subject: ctdb-scripts: Remove function rewrite_ctdb_options()
X-Git-Tag: ldb-1.4.0~470
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6c67d9ed29d863d74ad98d1d344797ad2e1db54;p=thirdparty%2Fsamba.git

ctdb-scripts: Remove function rewrite_ctdb_options()

This is no longer necessary after the removal of support for
CTDB_DBDIR=tmpfs.

File-local variable ctdb_rundir is no longer used, so drop it.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Tue May  1 16:20:37 CEST 2018 on sn-devel-144
---

diff --git a/ctdb/config/functions b/ctdb/config/functions
index 020a19a7c3f..69b51724249 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -11,7 +11,6 @@ export CTDB_BASE
 # CTDB_VARDIR is used elsewhere
 # shellcheck disable=SC2034
 CTDB_VARDIR="/usr/local/var/lib/ctdb"
-ctdb_rundir="/usr/local/var/run/ctdb"
 
 CTDB="${CTDB:-/usr/local/bin/ctdb}"
 
@@ -32,30 +31,6 @@ fi
 #######################################
 # pull in a system config file, if any
 
-rewrite_ctdb_options ()
-{
-    case "$CTDB_DBDIR" in
-	tmpfs|tmpfs:*)
-	    _opts_defaults="mode=700"
-	    # Get any extra options specified after colon
-	    if [ "$CTDB_DBDIR" = "tmpfs" ] ; then
-		_opts=""
-	    else
-		_opts="${CTDB_DBDIR#tmpfs:}"
-	    fi
-	    # It is OK to repeat mount options - last value wins.
-	    # CTDB_DBDIR_TMPFS_OPTIONS is used by ctdbd_wrapper
-	    # shellcheck disable=SC2034
-	    CTDB_DBDIR_TMPFS_OPTIONS="${_opts_defaults}${_opts:+,}${_opts}"
-
-	    CTDB_DBDIR="${ctdb_rundir}/CTDB_DBDIR"
-	    ;;
-	*)
-	    # shellcheck disable=SC2034
-	    CTDB_DBDIR_TMPFS_OPTIONS=""
-    esac
-}
-
 load_system_config ()
 {
 	if [ -z "$1" ] ; then
@@ -77,7 +52,6 @@ loadconfig() {
 	if [ -r "$_config" ] ; then
 		. "$_config"
 	fi
-	rewrite_ctdb_options
 }
 
 load_script_options ()