From f6cfb92d54918c46dbc8673396333b50317cfb36 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Mon, 20 Nov 2017 21:52:34 -0600 Subject: rc.inet1*: Fix DHCP timeout This was accidentally changed from 15 seconds back to the 14.2 default of 10 seconds. Thanks to Eduard Rozenberg. --- rc.inet1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'rc.inet1') diff --git a/rc.inet1 b/rc.inet1 index 0ab1c6e..b3f3596 100644 --- a/rc.inet1 +++ b/rc.inet1 @@ -192,14 +192,14 @@ if_up() { # if [ "$CONNSTATUS" = "0" ]; then # # The kernel has just told us the cable isn't even plugged in, but we will # # give any DHCP server a short chance to reply anyway: - # echo "No carrier detected on ${1}. Reducing DHCP timeout to 10 seconds." - # DHCP_TIMEOUT[$i]=10 + # echo "No carrier detected on ${1}. Reducing DHCP timeout to 15 seconds." + # DHCP_TIMEOUT[$i]=15 # fi #fi #### (end commented out) - # 10 seconds should be a reasonable default DHCP timeout. 30 was too much. - echo "/etc/rc.d/rc.inet1: /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-10} ${DHCP_OPTIONS} ${1}" | $LOGGER - /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-10} ${DHCP_OPTIONS} ${1} + # 15 seconds should be a reasonable default DHCP timeout. 30 was too much. + echo "/etc/rc.d/rc.inet1: /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}" | $LOGGER + /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1} # If the dhcpcd call succeeds, add extra IP addresses, if defined, to interface if [ "$?" == "0" -a ! -z "${IPALIASES[$1]}" ]; then num=0 -- cgit v1.2.3