diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-02 12:03:03 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-02 12:03:03 +1100 |
| commit | 4ccb384327d2f1b8c7d1e6ac4806062888154513 (patch) | |
| tree | 4f553f54e781f201b2269355ca95925938b331c4 /source4/setup/provision | |
| parent | 2ab6dd9ea58c7f09791f45077df084447fc7de69 (diff) | |
| parent | 3c0c6acc594fba1f1d28e49cb105c99fa1649a18 (diff) | |
| download | samba-4ccb384327d2f1b8c7d1e6ac4806062888154513.tar.gz samba-4ccb384327d2f1b8c7d1e6ac4806062888154513.tar.bz2 samba-4ccb384327d2f1b8c7d1e6ac4806062888154513.zip | |
Fix merge of my host GUID removal and the IPv6 addition to provision
Merge branch 'v4-0-ipv6' of git://git.id10ts.net/samba into 4-0-abartlet
Andrew Bartlett
(This used to be commit d3336684f084f984500dd0893dd01bcfc5be0ab1)
Diffstat (limited to 'source4/setup/provision')
| -rwxr-xr-x | source4/setup/provision | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index 30067f5592..afda9eeade 100755 --- a/source4/setup/provision +++ b/source4/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, |