summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-15 14:40:51 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-20 14:05:32 +1000
commit6c9a78074a429773cefd1a3c798b7e3ad7d4c325 (patch)
tree285855377bfc9d3ccd308c1faa82e9b2157d7efb
parentedd3e8b03aa0bca85d4a9a62b35471e76a1f9390 (diff)
downloadsamba-6c9a78074a429773cefd1a3c798b7e3ad7d4c325.tar.gz
build: Put lockdir and cachedir in FHS-like locations by default
This does not move statedir, leaving it in PREFIX/var/locks because state files such as idmap are dangerous to move, as they might re-create, causing chaos. This isn't ideal, but I don't have a better solution right now. Andrew Bartlett
-rwxr-xr-xsource4/dynconfig/wscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 347c5bd0b2b..12fc17fe0ef 100755
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -9,8 +9,8 @@ dir_options = {
'with-privatedir' : [ '${PREFIX}/private', 'Where to put sam.ldb and other private files' ],
'with-sockets-dir' : [ '${LOCALSTATEDIR}/run', 'sockets directory' ],
'with-winbindd-privileged-socket-dir' : [ '${LOCALSTATEDIR}/lib/winbindd_privileged', 'winbind privileged socket directory'],
- 'with-lockdir' : [ '${LOCALSTATEDIR}/locks', 'where to put short term disposable state files' ],
- 'with-cachedir' : [ '${LOCALSTATEDIR}/locks', 'where to put cache files' ],
+ 'with-lockdir' : [ '${LOCALSTATEDIR}/lock', 'where to put short term disposable state files' ],
+ 'with-cachedir' : [ '${LOCALSTATEDIR}/cache', 'where to put cache files' ],
'with-logfilebase' : [ '${LOCALSTATEDIR}', 'Where to put log files' ],
'with-pammodulesdir' : [ '${LIBDIR}', 'Which directory to use for PAM modules' ],
'with-statedir' : [ '${LOCALSTATEDIR}/locks', 'where to put persistent state files' ],