We shoudln't have to disable timeout.

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 638f1518ca6e2fdc7f08531ac6dc5205f0c49d44..97c0af44b9fd940ec0db00654ff2f357068bf3b9 100644 (file)
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd Jul 09, 2008
+.Dd Jul 12, 2008
 .Dt DHCPCD 8 SMM
 .Sh NAME
 .Nm dhcpcd
@@ -326,9 +326,6 @@ So to stop dhcpcd from touching your DNS or MTU settings you would do:-
 .D1 dhcpcd -C resolv.conf -C mtu eth0
 .It Fl X , -nodaemonise
 Don't daemonise when we acquire a lease.
-This disables the
-.Fl t, -timeout
-option.
 This is mainly useful for running under the control of another process, such
 as a debugger or a network manager.
 .It Fl L , -noipv4ll

diff --git a/dhcpcd.c b/dhcpcd.c
index 4cf2a73b033874ce8192b650f6c3e22ca443dac9..aa589a8512b286a20b4b75fd6c3172edba54c4b8 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -870,9 +870,6 @@ main(int argc, char **argv)
                }
        }
 
-       if (!(options->options & DHCPCD_DAEMONISE))
-               options->timeout = 0;
-
        if (IN_LINKLOCAL(ntohl(options->request_address.s_addr))) {
                logger(LOG_ERR,
                       "you are not allowed to request a link local address");