diff options
Diffstat (limited to 'source4/setup/upgrade_from_s3')
| -rwxr-xr-x | source4/setup/upgrade_from_s3 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source4/setup/upgrade_from_s3 b/source4/setup/upgrade_from_s3 index a7bc6f0abd..e0d4604b6e 100755 --- a/source4/setup/upgrade_from_s3 +++ b/source4/setup/upgrade_from_s3 @@ -26,18 +26,14 @@ sys.path.insert(0, "bin/python") import samba import samba.getopt as options from samba.auth import system_session -from samba.provision import find_setup_dir from samba.upgrade import upgrade_provision from samba.samba3 import Samba3 - parser = optparse.OptionParser("upgrade_from_s3 [options] <libdir> <smbconf>") sambaopts = options.SambaOptions(parser) parser.add_option_group(sambaopts) parser.add_option_group(options.VersionOptions(parser)) credopts = options.CredentialsOptions(parser) parser.add_option_group(credopts) -parser.add_option("--setupdir", type="string", metavar="DIR", - help="directory with setup files") parser.add_option("--quiet", help="Be quiet") parser.add_option("--blank", help="do not add users or groups, just the structure") @@ -73,14 +69,10 @@ samba3 = Samba3(libdir, smbconf) logger.info("Provisioning") -setup_dir = opts.setupdir -if setup_dir is None: - setup_dir = find_setup_dir() - lp = sambaopts.get_loadparm() smbconf = lp.configfile creds = credopts.get_credentials(lp) -upgrade_provision(samba3, setup_dir, logger, credentials=creds, +upgrade_provision(samba3, logger, credentials=creds, session_info=system_session(), smbconf=smbconf, targetdir=opts.targetdir) |