Remove references to setting the host GUID, as the repl_meta_data

[samba.git] / source4 / setup / provision

diff --git a/source4/setup/provision b/source4/setup/provision
index b0363d8a8f2a24a15284e082d465e5eba6e5dd3b..30067f559230f6a5af75de1e2a556d7fcdafa066 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -52,14 +52,12 @@ parser.add_option("--domain-sid", type="string", metavar="SID",
                help="set domainsid (otherwise random)")
 parser.add_option("--policy-guid", type="string", metavar="GUID",
                                  help="set policy guid")
+parser.add_option("--invocationid", type="string", metavar="GUID", 
+                 help="set invocationid (otherwise random)")
 parser.add_option("--host-name", type="string", metavar="HOSTNAME", 
                help="set hostname")
 parser.add_option("--host-ip", type="string", metavar="IPADDRESS", 
                help="set ipaddress")
-parser.add_option("--host-guid", type="string", metavar="GUID", 
-               help="set hostguid (otherwise random)")
-parser.add_option("--invocationid", type="string", metavar="GUID", 
-               help="set invocationid (otherwise random)")
 parser.add_option("--adminpass", type="string", metavar="PASSWORD", 
                help="choose admin password (otherwise random)")
 parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD", 
@@ -111,7 +109,8 @@ if opts.realm is None or opts.domain is None:
        parser.print_usage()
        sys.exit(1)
 
-smbconf = sambaopts.get_loadparm().configfile()
+lp = sambaopts.get_loadparm()
+smbconf = lp.configfile()
 
 if opts.aci is not None:
        print "set ACI: %s" % opts.aci
@@ -123,7 +122,7 @@ elif opts.server_role == "member":
 else:
         server_role = opts.server_role
 
-creds = credopts.get_credentials()
+creds = credopts.get_credentials(lp)
 
 setup_dir = opts.setupdir
 if setup_dir is None:
@@ -140,7 +139,7 @@ provision(setup_dir, message,
           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,
-          hostip=opts.host_ip, hostguid=opts.host_guid, 
+          hostip=opts.host_ip, 
           invocationid=opts.invocationid, adminpass=opts.adminpass,
           krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass,
           dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody,
@@ -148,12 +147,3 @@ provision(setup_dir, message,
           aci=opts.aci, serverrole=server_role, 
           ldap_backend=opts.ldap_backend, 
           ldap_backend_type=opts.ldap_backend_type)
-
-message("To reproduce this provision, run with:")
-def shell_escape(arg):
-    if " " in arg:
-        return '"%s"' % arg
-    return arg
-message(" ".join([shell_escape(arg) for arg in sys.argv]))
-
-message("All OK")