mirror of
https://github.com/samba-team/samba.git
synced 2025-02-26 21:57:41 +03:00
s4-provision: setup posix:eadb using lp.set()
this allows it to override a setting made during the automatic testing of xattr support
This commit is contained in:
parent
9432eabb2f
commit
333975d84f
@ -595,9 +595,7 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
|
||||
privdir = os.path.join(targetdir, "private")
|
||||
else:
|
||||
privdir = lp.get("private dir")
|
||||
posixeadb_line = "posix:eadb = " + os.path.abspath(os.path.join(privdir, "eadb.tdb"))
|
||||
else:
|
||||
posixeadb_line = ""
|
||||
lp.set("posix:eadb", os.path.abspath(os.path.join(privdir, "eadb.tdb")))
|
||||
|
||||
if targetdir is not None:
|
||||
privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private"))
|
||||
@ -634,8 +632,7 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
|
||||
"SETUPDIRECTORY_LINE": setupdir_line,
|
||||
"SIDGENERATOR_LINE": sid_generator_line,
|
||||
"PRIVATEDIR_LINE": privatedir_line,
|
||||
"LOCKDIR_LINE": lockdir_line,
|
||||
"POSIXEADB_LINE": posixeadb_line
|
||||
"LOCKDIR_LINE": lockdir_line
|
||||
})
|
||||
|
||||
# reload the smb.conf
|
||||
|
@ -7,7 +7,6 @@
|
||||
${SIDGENERATOR_LINE}
|
||||
${PRIVATEDIR_LINE}
|
||||
${LOCKDIR_LINE}
|
||||
${POSIXEADB_LINE}
|
||||
|
||||
[netlogon]
|
||||
path = ${NETLOGONPATH}
|
||||
|
@ -7,4 +7,3 @@
|
||||
${SIDGENERATOR_LINE}
|
||||
${PRIVATEDIR_LINE}
|
||||
${LOCKDIR_LINE}
|
||||
${POSIXEADB_LINE}
|
||||
|
@ -7,4 +7,3 @@
|
||||
${SIDGENERATOR_LINE}
|
||||
${PRIVATEDIR_LINE}
|
||||
${LOCKDIR_LINE}
|
||||
${POSIXEADB_LINE}
|
||||
|
Loading…
x
Reference in New Issue
Block a user