Move the --renew option to --rebind as it's more accurate (both are -n). Support...

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index ed422aa94e29f683708cc06d511c88ff42935610..6c82d3fbb0414f91a31cf596caf39a0b5017e845 100644 (file)
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -169,6 +169,8 @@ process running on the
 to release its lease, deconfigure the
 .Ar interface
 and then exit.
+.Nm
+then waits until this process has exited.
 .It Fl l , -leasetime Ar seconds
 Request a specific lease time in
 .Ar seconds .
@@ -190,17 +192,27 @@ Request the DHCP
 .Ar option
 variable for use in
 .Pa @SCRIPT@ .
-.It Fl n , -renew
+.It Fl n , -rebind
 Notifies an existing
 .Nm
 process running on the
 .Ar interface
-to renew it's lease.
+to rebind it's lease.
 .Nm
 will not re-configure itself or use any other command line arguments.
+.Nm
+will timeout the rebind after 30 seconds at which point the lease will be
+expired and
+.Nm
+will enter the discovery state to obtain a new lease.
+Use the
+.Fl t , -timeout
+option to change this.
 If
 .Nm
 is not running, then it starts up as normal.
+This option used to be renew, but rebind is more accurate as we need to
+broadcast the request instead of unicasting.
 .It Fl p , -persistent
 .Nm
 normally deconfigures the

diff --git a/dhcpcd.c b/dhcpcd.c
index 15f487ddd5a1c2d16ce1b2633291b9fc734ec183..dc2082a7fef7872366acf12545ff3f7198ad614d 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -67,7 +67,7 @@ static const struct option longopts[] = {
        {"release",       no_argument,        NULL, 'k'},
        {"leasetime",     required_argument,  NULL, 'l'},
        {"metric",        required_argument,  NULL, 'm'},
-       {"renew",         no_argument,        NULL, 'n'},
+       {"rebind",        no_argument,        NULL, 'n'},
        {"option",        required_argument,  NULL, 'o'},
        {"persistent",    no_argument,        NULL, 'p'},
        {"quiet",         no_argument,        NULL, 'q'},
@@ -96,6 +96,7 @@ static const struct option longopts[] = {
        {"version",       no_argument,        &doversion, 1},
 #ifdef CMDLINE_COMPAT
        {"classid",       optional_argument,  NULL, 'i'},
+       {"renew",         no_argument,        NULL, 'n'},
        {"nohostname",    no_argument,        NULL, 'H'},
        {"nomtu",         no_argument,        NULL, 'M'},
        {"nontp",         no_argument,        NULL, 'N'},