summaryrefslogtreecommitdiff
path: root/source4/scripting/bin/upgradeprovision
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2009-11-29 19:44:08 +0300
committerAndrew Bartlett <abartlet@samba.org>2009-12-01 12:17:52 +1100
commit1d0d78ab3d1f4210984a5a012cdb6d17862cec51 (patch)
treea86a82ce1b5bddafcf47f78657ae36d7eea1aa3b /source4/scripting/bin/upgradeprovision
parentfe1291227f0a3137938dc369afc2f63626c30359 (diff)
downloadsamba-1d0d78ab3d1f4210984a5a012cdb6d17862cec51.tar.gz
samba-1d0d78ab3d1f4210984a5a012cdb6d17862cec51.tar.bz2
samba-1d0d78ab3d1f4210984a5a012cdb6d17862cec51.zip
s4: Remove targetdir as it can cause some trouble and can be replaced by an adapted -s smb.conf
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/scripting/bin/upgradeprovision')
-rwxr-xr-xsource4/scripting/bin/upgradeprovision4
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index bfe561027e..48f67476a4 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -112,8 +112,6 @@ parser.add_option("--debugchange", help="Print information on what is different
parser.add_option("--debugchangesd", help="Print information security descriptors differences", action="store_true")
parser.add_option("--debugall", help="Print all available information (very verbose)", action="store_true")
parser.add_option("--full", help="Perform full upgrade of the samdb (schema, configuration, new objects, ...", action="store_true")
-parser.add_option("--targetdir", type="string", metavar="DIR",
- help="Set target directory")
opts = parser.parse_args()[0]
@@ -748,7 +746,7 @@ def update_machine_account_password(paths,creds,session,names):
# From here start the big steps of the program
# First get files paths
-paths=get_paths(targetdir=opts.targetdir,smbconf=smbconf)
+paths=get_paths(smbconf=smbconf)
paths.setup = setup_dir
def setup_path(file):
return os.path.join(setup_dir, file)