From: Roy Marples <roy@marples.name>
Date: Tue, 13 Oct 2009 06:02:30 +0000 (+0000)
Subject: wait -> waitip
X-Git-Tag: v5.1.2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cea7dcafce6cf06b87031aed015fcae7a0275c89;p=thirdparty%2Fdhcpcd.git

wait -> waitip
It's more descriptive and allows future wait$entity commands.
---

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 50997a09..9653044a 100644
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -339,7 +339,7 @@ Set the vendor option 03 with an IP address as a string.
 .D1 dhcpcd \-v 03,\e"192.168.0.2\e" eth0
 Set un-encapulated vendor option to hello world.
 .D1 dhcpcd \-v ,"hello world" eth0
-.It Fl w , -wait
+.It Fl w , -waitip
 Wait for an address to be assigned before forking to the background.
 .It Fl x , -exit
 This will signal an existing
diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index 8a1f94b9..3a41dbc4 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -272,7 +272,7 @@ Set un-encapulated vendor option to hello world.
 .It Ic vendorclassid Ar string
 Change the default vendorclassid sent from dhcpcd-version.
 If not set then none is sent.
-.It Ic wait
+.It Ic waitip
 Wait for an address to be assigned before forking to the background.
 .El
 .Sh SEE ALSO
diff --git a/if-options.c b/if-options.c
index f5557145..c4d8d096 100644
--- a/if-options.c
+++ b/if-options.c
@@ -72,7 +72,7 @@ const struct option cf_options[] = {
 	{"timeout",         required_argument, NULL, 't'},
 	{"userclass",       required_argument, NULL, 'u'},
 	{"vendor",          required_argument, NULL, 'v'},
-	{"wait",            no_argument,       NULL, 'w'},
+	{"waitip",          no_argument,       NULL, 'w'},
 	{"exit",            no_argument,       NULL, 'x'},
 	{"allowinterfaces", required_argument, NULL, 'z'},
 	{"reboot",          required_argument, NULL, 'y'},