Use convenience function for finding setup_dir based on location of

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

diff --git a/source4/setup/provision b/source4/setup/provision
index 55a438cb659a1032f922167cc36faebc4b2666a3..5cb851ceb79879214ab85a10f16466b4a31ada5d 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -35,7 +35,7 @@ from samba.credentials import DONT_USE_KERBEROS
 from samba.auth import system_session
 import samba.getopt as options
 from samba import param
-from samba.provision import provision, FILL_FULL, FILL_NT4SYNC, FILL_DRS
+from samba.provision import provision, FILL_FULL, FILL_NT4SYNC, FILL_DRS, find_setup_dir
 
 # how do we make this case insensitive??
 
@@ -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.getfqdn().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: ")
@@ -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 = find_setup_dir()
 
 samdb_fill = FILL_FULL
 if opts.blank: