summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-21 14:26:06 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-21 14:26:06 +0100
commite4801a426a954040aeb6d2c6d5c1b3e596bd1cab (patch)
treee0e206acc5d64729971295f4c7ca391ed8f1c9ef
parent1101d7aa57eb559a13cc35422c57e8c5766c2a9c (diff)
downloadsamba-e4801a426a954040aeb6d2c6d5c1b3e596bd1cab.tar.gz
samba-e4801a426a954040aeb6d2c6d5c1b3e596bd1cab.tar.bz2
samba-e4801a426a954040aeb6d2c6d5c1b3e596bd1cab.zip
Use script path to find the setup directory.
-rwxr-xr-xsource4/setup/provision2
-rwxr-xr-xsource4/setup/provision-backend2
-rwxr-xr-xsource4/setup/upgrade2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/setup/provision b/source4/setup/provision
index d097eb9411..1e203dbe02 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -168,7 +168,7 @@ creds.set_kerberos_state(DONT_USE_KERBEROS)
setup_dir = opts.setupdir
if setup_dir is None:
- setup_dir = "setup"
+ setup_dir = os.path.dirname(__file__)
samdb_fill = FILL_FULL
if opts.blank:
diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index 756870d5df..e4e2d56020 100755
--- a/source4/setup/provision-backend
+++ b/source4/setup/provision-backend
@@ -94,7 +94,7 @@ else:
setup_dir = opts.setupdir
if setup_dir is None:
- setup_dir = "setup"
+ setup_dir = os.path.dirname(__file__)
provision_backend(setup_dir=setup_dir, message=message, smbconf=smbconf, targetdir=opts.targetdir,
realm=opts.realm, domain=opts.domain,
diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index 9d73093434..9c1a0cfce8 100755
--- a/source4/setup/upgrade
+++ b/source4/setup/upgrade
@@ -71,7 +71,7 @@ message("Provisioning\n")
setup_dir = opts.setupdir
if setup_dir is None:
- setup_dir = "setup"
+ setup_dir = os.path.dirname(__file__)
lp = sambaopts.get_loadparm()
smbconf = lp.configfile