diff options
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/provision.py | 9 | ||||
| -rwxr-xr-x | source4/setup/upgrade.py | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/source4/setup/provision.py b/source4/setup/provision.py index 9f887e8b3b..033d2491f2 100755 --- a/source4/setup/provision.py +++ b/source4/setup/provision.py @@ -26,9 +26,6 @@ import getopt import optparse import os, sys -# Add path to the library for in-tree use -sys.path.append("scripting/python") - import samba from auth import system_session @@ -130,12 +127,12 @@ lp.set("realm", opts.realm) lp.set("workgroup", opts.domain) lp.set("server role", opts.server_role or "domain controller") - if opts.aci is not None: print "set ACI: %s" % opts.aci -paths = provision_paths_from_lp(lp, opts.realm.lower(), private_dir) -paths.smbconf = sambaopts.get_loadparm_path() +paths = provision_paths_from_lp(lp, opts.realm.lower()) +if sambaopts.get_loadparm_path() is not None: + paths.smbconf = sambaopts.get_loadparm_path() creds = credopts.get_credentials() diff --git a/source4/setup/upgrade.py b/source4/setup/upgrade.py index 4cf9641ef2..960cd1b9e2 100755 --- a/source4/setup/upgrade.py +++ b/source4/setup/upgrade.py @@ -7,7 +7,6 @@ import getopt import optparse import os, sys -sys.path.append("scripting/python") import param import samba import samba.getopt as options |