Clarify the timeout behaviour if in master mode or per interface.

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 0bdbc3fffb36a9126c5c423ab83148149e0f610a..8edd662b2d3b3292ec93ff354338eed799ab1d5c 100644 (file)
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -407,6 +407,17 @@ A setting of 0
 causes
 .Nm
 to wait forever to get a lease.
+If
+.Nm
+is working on a single interface then
+.Nm
+will exit when a timeout occurs, otherwise
+.Nm
+will fork into the background.
+If using IPv4LL then
+.Nm
+start the IPv4LL process after the timeout and then wait a little longer
+before really timing out.
 .It Fl u , Fl Fl userclass Ar class
 Tags the DHCP message with the userclass
 .Ar class .

diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index 9f6e083ee705ad0564589b10647f319372fbbc0f..84e7c03ff4d2b993ea001b244c31d2e4163417bf 100644 (file)
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -388,13 +388,25 @@ into the value.
 .D1 static ip_address=
 .D1 destination routers
 .It Ic timeout Ar seconds
-The default timeout for waiting for a DHCP response is 30 seconds which may
-be too long or too short and can be changed here.
+Timeout after
+.Ar seconds ,
+instead of the default 30.
 A setting of 0
 .Ar seconds
 causes
 .Nm dhcpcd
 to wait forever to get a lease.
+If
+.Nm dhcpcd
+is working on a single interface then
+.Nm dhcpcd
+will exit when a timeout occurs, otherwise
+.Nm dhcpcd
+will fork into the background.
+If using IPv4LL then
+.Nm dhcpcd
+start the IPv4LL process after the timeout and then wait a little longer
+before really timing out.
 .It Ic userclass Ar string
 Tag the DHCP messages with the userclass.
 You can specify more than one.