s4: Remove targetdir as it can cause some trouble and can be replaced by an adapted...

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index bfe561027e537786f2192d4d592676534c6c44ea..48f67476a4613f4847b22f426980101b3e312cf0 100755 (executable)
--- 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)