[Pkg-samba-maint] r3929 - trunk/ctdb/debian

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-10-13 18:35:28 +0000 (Thu, 13 Oct 2011)
New Revision: 3929

Modified:
   trunk/ctdb/debian/ctdb.init
Log:
ctdb.init: $PERSISTENT_DB_DIR based on $CTDB_VARDIR instead of hardcoded /var/ctdb and /var/lib/ctdb

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2011-10-13 18:20:25 UTC (rev 3928)
+++ trunk/ctdb/debian/ctdb.init	2011-10-13 18:35:28 UTC (rev 3929)
@@ -200,10 +200,7 @@
 }
 
 check_persistent_databases () {
-    case $init_style in
-        debian) PERSISTENT_DB_DIR="${CTDB_DBDIR:-/var/lib/ctdb}/persistent" ;;
-        *) PERSISTENT_DB_DIR="${CTDB_DBDIR:-/var/ctdb}/persistent" ;;
-    esac
+    PERSISTENT_DB_DIR="${CTDB_DBDIR:-$CTDB_VARDIR}/persistent"
     mkdir -p $PERSISTENT_DB_DIR 2>/dev/null
     local ERRCOUNT=$CTDB_MAX_PERSISTENT_CHECK_ERRORS