--interactive doesn't take any argument.

[ira/wip.git] / source4 / setup / provision

diff --git a/source4/setup/provision b/source4/setup/provision
index 4b48bab676e14b0a81f08e2c5ab7e6992c1c24e5..eab5d09424d066add9d10c9cb6fe8c9c35be1b2c 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -45,7 +45,7 @@ parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
-parser.add_option("--interactive", help="Ask for names")
+parser.add_option("--interactive", help="Ask for names", action="store_true")
 parser.add_option("--setupdir", type="string", metavar="DIR", 
                help="directory with setup files")
 parser.add_option("--realm", type="string", metavar="REALM", help="set realm")
@@ -129,8 +129,18 @@ if opts.interactive:
                else:
                        print "%s: " % (prompt,),
                return sys.stdin.readline().rstrip("\n") or default
-       opts.realm = ask("Realm", socket.gethostname().split(".", 1)[1].upper())
-       opts.domain = ask("Domain", opts.realm.split(".")[0])
+       try:
+               opts.realm = ask("Realm", socket.getfqdn().split(".", 1)[1].upper())
+       except IndexError:
+               print >>sys.stderr, "Cannot guess realm from %s" % ( socket.getfqdn())
+               sys.exit(1)
+
+       try:
+               opts.domain = ask("Domain", opts.realm.split(".")[0])
+       except IndexError:
+               print >>sys.stderr, "Cannot guess domain from %s" % ( opts.realm())
+               sys.exit(1)
+
        opts.server_role = ask("Server Role (dc, member, standalone)", "dc")
        for i in range(3):
                opts.adminpass = getpass("Administrator password: ")
@@ -140,7 +150,7 @@ if opts.interactive:
                        break
 
 lp = sambaopts.get_loadparm()
-smbconf = lp.configfile()
+smbconf = lp.configfile
 
 if opts.aci is not None:
        print "set ACI: %s" % opts.aci
@@ -150,7 +160,7 @@ if opts.server_role == "dc":
 elif opts.server_role == "member":
        server_role = "member server"
 else:
-        server_role = opts.server_role
+       server_role = opts.server_role
 
 creds = credopts.get_credentials(lp)
 
@@ -158,7 +168,7 @@ creds.set_kerberos_state(DONT_USE_KERBEROS)
 
 setup_dir = opts.setupdir
 if setup_dir is None:
-       setup_dir = "setup"
+       setup_dir = os.path.dirname(__file__)
 
 samdb_fill = FILL_FULL
 if opts.blank:
@@ -166,8 +176,9 @@ if opts.blank:
 elif opts.partitions_only:
     samdb_fill = FILL_DRS
 
+session = system_session()
 provision(setup_dir, message, 
-          system_session(), creds, smbconf=smbconf, targetdir=opts.targetdir,
+          session, creds, smbconf=smbconf, targetdir=opts.targetdir,
           samdb_fill=samdb_fill, realm=opts.realm, domain=opts.domain,
           domainguid=opts.domain_guid, domainsid=opts.domain_sid,
           policyguid=opts.policy_guid, hostname=opts.host_name,