diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2013-10-03 15:19:05 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-10-25 12:06:07 +1100 |
| commit | 7eb680a95fcdacfd47d7ddab3a4df5b9ed0c837d (patch) | |
| tree | 0bad71afa324787b1f9b4aac069b2fa25abcbe30 /ctdb/configure.ac | |
| parent | 4432aef6d1c98b9e73f60139afa6a36b4dd6ba76 (diff) | |
| download | samba-7eb680a95fcdacfd47d7ddab3a4df5b9ed0c837d.tar.gz samba-7eb680a95fcdacfd47d7ddab3a4df5b9ed0c837d.tar.xz samba-7eb680a95fcdacfd47d7ddab3a4df5b9ed0c837d.zip | |
build: Move the default CTDB socket from /tmp to /var/run/ctdb
Use /var/run/ctdb/ctdbd.socket because there might be other daemons
that need sockets in the future.
The local daemons test code to create a link for the default
convenience socket has to be removed because the link can't be created
as a regular user in the new location. This should be OK since all
calls to the ctdb tool in the test code should be wrapped in onnode.
When debugging tests, a developer will have to set CTDB_SOCKET by
hand.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Pair-programmed-with: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit dc67a4e24af9d07aead2a1710eeaf5d6cc409201)
Diffstat (limited to 'ctdb/configure.ac')
| -rw-r--r-- | ctdb/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/configure.ac b/ctdb/configure.ac index f3d2033aa93..9621f42a658 100644 --- a/ctdb/configure.ac +++ b/ctdb/configure.ac @@ -72,9 +72,9 @@ if test ! -z "$LOGDIR"; then fi AC_SUBST(LOGDIR) -SOCKPATH='/tmp/ctdb.socket' +SOCKPATH='${localstatedir}/run/ctdb/ctdbd.socket' AC_ARG_WITH([socketpath], - [ --with-socketpath=FILE path to CTDB daemon socket [[/tmp/ctdb.socket]]], + [ --with-socketpath=FILE path to CTDB daemon socket [[LOCALSTATEDIR/run/ctdb/ctdbd.socket]]], SOCKPATH=$withval) if test ! -z "$SOCKPATH"; then if test "$SOCKPATH" = "yes" -o "$SOCKPATH" = "no"; then |