summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2011-08-26 10:01:29 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-08-26 10:07:36 +1000
commit76ff9bffd873e923c3fa156c60ccd34e7de3cdc2 (patch)
tree191b448f23753a794c6b645230001b008b38e4e0
parenteebb37c9b23fab3c4dc0790352a557abaf0c9898 (diff)
downloadsamba-76ff9bffd873e923c3fa156c60ccd34e7de3cdc2.tar.gz
samba-76ff9bffd873e923c3fa156c60ccd34e7de3cdc2.tar.bz2
samba-76ff9bffd873e923c3fa156c60ccd34e7de3cdc2.zip
s3_upgrade: Set lock directory to correct directory
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/scripting/python/samba/upgrade.py1
-rwxr-xr-xsource4/setup/upgrade_from_s33
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index ff4db9bb2b..7386d0b4b1 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -562,6 +562,7 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None):
new_lp_ctx.load(result.lp.configfile)
new_lp_ctx.set("private dir", result.lp.get("private dir"))
new_lp_ctx.set("state directory", result.lp.get("state directory"))
+ new_lp_ctx.set("lock directory", result.lp.get("lock directory"))
# Connect to samba4 backend
s4_passdb = passdb.PDB(new_lp_ctx.get("passdb backend"))
diff --git a/source4/setup/upgrade_from_s3 b/source4/setup/upgrade_from_s3
index c7a4b97ef4..81609e0349 100755
--- a/source4/setup/upgrade_from_s3
+++ b/source4/setup/upgrade_from_s3
@@ -87,16 +87,17 @@ else:
logger.setLevel(logging.INFO)
s3conf = s3param.get_context()
-#s3conf.load_default()
# Set correct default values from libdir or testparm
paths = {}
if libdir:
paths["state directory"] = libdir
paths["private dir"] = libdir
+ paths["lock directory"] = libdir
else:
paths["state directory"] = get_testparm_var(testparm, "state directory")
paths["private dir"] = get_testparm_var(testparm, "private dir")
+ paths["lock directory"] = get_testparm_var(testparm, "lock directory")
for p in paths:
s3conf.set(p, paths[p])