summaryrefslogtreecommitdiff
path: root/source4/setup/provision
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-10-18 11:48:14 +1100
committerAndrew Bartlett <abartlet@samba.org>2010-10-18 11:13:04 +0000
commitba9e787c7d51ab7b381361e02efad97c5814d3c7 (patch)
treec1fc471ccb935843e26a6244f5062d00557429cf /source4/setup/provision
parentd1ca35cbecaa788bcbb0e307ca2385c4e7f1ba0c (diff)
downloadsamba-ba9e787c7d51ab7b381361e02efad97c5814d3c7.tar.gz
samba-ba9e787c7d51ab7b381361e02efad97c5814d3c7.tar.bz2
samba-ba9e787c7d51ab7b381361e02efad97c5814d3c7.zip
s4-provision Use --ldap-backend-nosync rather than just --nosync
For some reason we had both options, and --ldap-backend-nosync is the better name. Andrew Bartlett
Diffstat (limited to 'source4/setup/provision')
-rwxr-xr-xsource4/setup/provision3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/setup/provision b/source4/setup/provision
index 035fa2a2ca..21d94cba27 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -115,7 +115,6 @@ parser.add_option("--slapd-path", type="string", metavar="SLAPD-PATH",
help="Path to slapd for LDAP backend [e.g.:'/usr/local/libexec/slapd']. Required for Setup with LDAP-Backend. OpenLDAP Version >= 2.4.17 should be used.")
parser.add_option("--setup-ds-path", type="string", metavar="SETUP_DS-PATH",
help="Path to setup-ds.pl script for Fedora DS LDAP backend [e.g.:'/usr/sbin/setup-ds.pl']. Required for Setup with Fedora DS backend.")
-parser.add_option("--nosync", help="Configure LDAP backend not to call fsync() (for performance in test environments)", action="store_true")
parser.add_option("--use-xattrs", type="choice", choices=["yes","no","auto"], help="Define if we should use the native fs capabilities or a tdb file for storing attributes likes ntacl, auto tries to make an inteligent guess based on the user rights and system capabilities", default="auto")
parser.add_option("--ldap-dryrun-mode", help="Configure LDAP backend, but do not run any binaries and exit early. Used only for the test environment. DO NOT USE", action="store_true")
@@ -249,7 +248,7 @@ try:
backend_type=opts.ldap_backend_type,
ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path,
- nosync=opts.nosync, ldap_dryrun_mode=opts.ldap_dryrun_mode,
+ nosync=opts.ldap_backend_nosync, ldap_dryrun_mode=opts.ldap_dryrun_mode,
useeadb=eadb, next_rid=opts.next_rid)
except ProvisioningError, e:
print str(e)