[PATCH 4/4] s4: Remove targetdir as it can cause some trouble and can be replaced by an adapted -s smb.conf

[Matthieu Patou]

---
 source4/scripting/bin/upgradeprovision |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index cb9e1d2..4b0cfec 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]
 
@@ -749,7 +747,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)
-- 
1.6.3.3


--------------030405010102080307060500
Content-Type: text/x-patch;
 name="0001-s4-load-the-domain-level-of-the-current-provision-an.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0001-s4-load-the-domain-level-of-the-current-provision-an.pa";
 filename*1="tch"