Use script path to find the setup directory.

diff --git a/source4/setup/provision b/source4/setup/provision
index d097eb941114af4f59c9ff8b560b5f8a100966a4..1e203dbe02640acfa1ddd01fd701ca146751ec77 100755 (executable)
--- 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 756870d5df4246ba59a89ad68464083fe7af4004..e4e2d56020375736336541ae5a6e3f97ed726a57 100755 (executable)
--- 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 9d7309343434654c4e27649cc354ff8e942bea4d..9c1a0cfce819b56b7e0d6cdb7c27b95f09559106 100755 (executable)
--- 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