Fix merge of my host GUID removal and the IPv6 addition to provision

[jelmer/samba4-debian.git] / source / setup / provision

diff --git a/source/setup/provision b/source/setup/provision
index 30067f559230f6a5af75de1e2a556d7fcdafa066..afda9eeaded3307902c52183820f350c2524d862 100755 (executable)
--- a/source/setup/provision
+++ b/source/setup/provision
@@ -57,7 +57,17 @@ parser.add_option("--invocationid", type="string", metavar="GUID",
 parser.add_option("--host-name", type="string", metavar="HOSTNAME", 
                help="set hostname")
 parser.add_option("--host-ip", type="string", metavar="IPADDRESS", 
+<<<<<<< HEAD:source/setup/provision
                help="set ipaddress")
+=======
+               help="set IPv4 ipaddress")
+parser.add_option("--host-ip6", type="string", metavar="IP6ADDRESS", 
+               help="set IPv6 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)")
+>>>>>>> 8585a3c77d5dfe97bca3f08716fc06ac2819f578:source/setup/provision
 parser.add_option("--adminpass", type="string", metavar="PASSWORD", 
                help="choose admin password (otherwise random)")
 parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD", 
@@ -139,7 +149,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, 
+          hostip=opts.host_ip, hostip6=opts.host_ip6,
           invocationid=opts.invocationid, adminpass=opts.adminpass,
           krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass,
           dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody,