diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 16:53:10 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 16:53:10 +0200 |
| commit | 36c8725d43982f94f9e20b5b26d7e9e7587cfaf3 (patch) | |
| tree | 8f2e5f83b67e5092eef5f62dac950f6c5df3517e /source4/setup/provision | |
| parent | 21f1f3aa686abbe6cc15b46108ee70b2e7538838 (diff) | |
| parent | 67bf4bab3ddaf8d1dfaee92007700d8f05a1c191 (diff) | |
| download | samba-36c8725d43982f94f9e20b5b26d7e9e7587cfaf3.tar.gz samba-36c8725d43982f94f9e20b5b26d7e9e7587cfaf3.tar.bz2 samba-36c8725d43982f94f9e20b5b26d7e9e7587cfaf3.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into tmp
(This used to be commit d777a83b8478bf09a45eccde38036eccbd219df8)
Diffstat (limited to 'source4/setup/provision')
| -rwxr-xr-x | source4/setup/provision | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index e354f4d0bb..259bd814a4 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -52,14 +52,14 @@ 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)") + help="set IPv4 ipaddress") +parser.add_option("--host-ip6", type="string", metavar="IP6ADDRESS", + help="set IPv6 ipaddress") parser.add_option("--adminpass", type="string", metavar="PASSWORD", help="choose admin password (otherwise random)") parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD", @@ -141,7 +141,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, 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, |