summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-04-02 12:31:24 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-04-02 12:31:24 +1100
commit67bf4bab3ddaf8d1dfaee92007700d8f05a1c191 (patch)
tree729a5751e83907bd4a2a43f6828de965cebbd3ee
parent4ccb384327d2f1b8c7d1e6ac4806062888154513 (diff)
downloadsamba-67bf4bab3ddaf8d1dfaee92007700d8f05a1c191.tar.gz
samba-67bf4bab3ddaf8d1dfaee92007700d8f05a1c191.tar.bz2
samba-67bf4bab3ddaf8d1dfaee92007700d8f05a1c191.zip
Fix conflicts in setup/provision script.
(This used to be commit 696b58f5dd8370b7ee0670c7a3e5db10234b41ff)
-rwxr-xr-xsource4/setup/provision8
1 files changed, 0 insertions, 8 deletions
diff --git a/source4/setup/provision b/source4/setup/provision
index afda9eeade..259bd814a4 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -57,17 +57,9 @@ 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",