diff options
| author | Darren 'Tadgy' Austin <darren@afterdark.org.uk> | 2018-09-14 18:49:50 +0100 |
|---|---|---|
| committer | Robby Workman <rworkman@slackware.com> | 2018-11-26 02:04:37 -0600 |
| commit | 8d3ed3a4ddcf35b75f7d99b75852ef420740c72c (patch) | |
| tree | bb36e6ff4a31ae22a38f0ecc9b7b37c9a5d16e72 | |
| parent | 5dcfe32331185127e8424414a7bc7cf05b5f95cd (diff) | |
| download | slacknetsetup-8d3ed3a4ddcf35b75f7d99b75852ef420740c72c.tar.xz | |
Remove hard coded -L from dhcpcd command line
Signed-off-by: Robby Workman <rworkman@slackware.com>
| -rw-r--r-- | rc.inet1 | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -216,10 +216,8 @@ if_up() { [ -n "${DHCP_IPADDR[$i]}" ] && DHCP_OPTIONS+=("-r" "${DHCP_IPADDR[$i]}") echo "Polling for DHCP server on interface ${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 - # For some reason, -L is given as a hard option to dhcpcd despite it being a conditional option from the tests above. - # No one seems to have noticed since this has been in Slackware for a long time, so keep doing it that way... - if /sbin/dhcpcd -L -t "${DHCP_TIMEOUT[$i]:-15}" "${DHCP_OPTIONS[@]}" ${1}; then + echo "/etc/rc.d/rc.inet1: /sbin/dhcpcd -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS[@]} ${1}" | $LOGGER + if /sbin/dhcpcd -t "${DHCP_TIMEOUT[$i]:-15}" "${DHCP_OPTIONS[@]}" ${1}; then IF_UP=1 else echo "/etc/rc.d/rc.inet1: failed to obtain DHCP lease for ${1}" | $LOGGER |