diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 16:18:06 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 16:18:06 +0100 |
| commit | 4977d913ed54935383155f7b2045fd6679bacc33 (patch) | |
| tree | cbd999112ec3ab851ea5be170cc0a453605c713f /source4 | |
| parent | f3ecb701335b1129947127d4c45eef970b66875c (diff) | |
| parent | b319549f129b1c79afc9bfd4a84f2730b96d69a3 (diff) | |
| download | samba-4977d913ed54935383155f7b2045fd6679bacc33.tar.gz samba-4977d913ed54935383155f7b2045fd6679bacc33.tar.bz2 samba-4977d913ed54935383155f7b2045fd6679bacc33.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/setup/provision | 2 | ||||
| -rwxr-xr-x | source4/setup/provision-backend | 2 | ||||
| -rwxr-xr-x | source4/setup/upgrade | 2 |
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 |