diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2013-10-03 15:47:30 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-10-25 12:06:07 +1100 |
| commit | 4432aef6d1c98b9e73f60139afa6a36b4dd6ba76 (patch) | |
| tree | f0e5e303c0c0f231e457405552408bd21793b1d4 | |
| parent | b595712f254d249e02cf4bbbc933063725286f78 (diff) | |
| download | samba-4432aef6d1c98b9e73f60139afa6a36b4dd6ba76.tar.gz samba-4432aef6d1c98b9e73f60139afa6a36b4dd6ba76.tar.xz samba-4432aef6d1c98b9e73f60139afa6a36b4dd6ba76.zip | |
packaging: Move ctdb/ directory from /var to /var/lib
Introduce CTDB_VARDIR variable that points to /var/lib/ctdb by default.
This makes CTDB_VARDIR consistent across C code and scripts.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 2c09aac71188f43cd592572b10ea30b7a2969678)
| -rwxr-xr-x | ctdb/Makefile.in | 1 | ||||
| -rw-r--r-- | ctdb/server/ctdbd.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index 0ae22e5ecea..4fed9a7a042 100755 --- a/ctdb/Makefile.in +++ b/ctdb/Makefile.in @@ -65,6 +65,7 @@ endif CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \ $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \ -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \ + -DCTDB_VARDIR=\"$(localstatedir)/lib/ctdb\" \ -DLOGDIR=\"$(logdir)\" -DBINDIR=\"$(bindir)\" \ -DSOCKPATH=\"$(sockpath)\" \ -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS) \ diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index 7fe99ba3118..5bf48a1a219 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -57,9 +57,9 @@ static struct { .transport = "tcp", .event_script_dir = NULL, .logfile = LOGDIR "/log.ctdb", - .db_dir = VARDIR "/ctdb", - .db_dir_persistent = VARDIR "/ctdb/persistent", - .db_dir_state = VARDIR "/ctdb/state", + .db_dir = CTDB_VARDIR, + .db_dir_persistent = CTDB_VARDIR "/persistent", + .db_dir_state = CTDB_VARDIR "/state", .script_log_level = DEBUG_ERR, }; |