From 76ff9bffd873e923c3fa156c60ccd34e7de3cdc2 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Fri, 26 Aug 2011 10:01:29 +1000 Subject: s3_upgrade: Set lock directory to correct directory Signed-off-by: Andrew Bartlett --- source4/setup/upgrade_from_s3 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/setup/upgrade_from_s3') 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]) -- cgit