wait -> waitip

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

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 50997a09af15961d9fd3fb09efbfa392547999d5..9653044a717f32ef1a3d9fdbc6e33eaa00782814 100644 (file)
--- 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 8a1f94b968697c1edd7df61eefe1a405df9b2ddd..3a41dbc44afa1a886b9454fc9cab6c8165cf7a80 100644 (file)
--- 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 f555714519fff47293dfde668ac98fa9931c9105..c4d8d09680a436b059a978f4a2fb8e7728f70b18 100644 (file)
--- 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'},