From 67bf4bab3ddaf8d1dfaee92007700d8f05a1c191 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 2 Apr 2008 12:31:24 +1100 Subject: Fix conflicts in setup/provision script. (This used to be commit 696b58f5dd8370b7ee0670c7a3e5db10234b41ff) --- source4/setup/provision | 8 -------- 1 file changed, 8 deletions(-) (limited to 'source4/setup') 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", -- cgit