summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren 'Tadgy' Austin <darren@afterdark.org.uk>2020-07-10 01:17:16 +0100
committerRobby Workman <rworkman@slackware.com>2021-02-27 20:21:16 -0600
commit81ff9e9faaee332e9e1f168f85d3d9f6bc158c14 (patch)
tree3eafd2456a8524c461ab92f906ba4f01b4fca2db
parentd1700da8cb47cdfbebf448865dea8e7b26577209 (diff)
downloadslacknetsetup-81ff9e9faaee332e9e1f168f85d3d9f6bc158c14.tar.xz
Restablish use of the -L option to assist Slackware ARM users.
-rw-r--r--rc.inet11
1 files changed, 0 insertions, 1 deletions
diff --git a/rc.inet1 b/rc.inet1
index f63f93e..cfb3bdd 100644
--- a/rc.inet1
+++ b/rc.inet1
@@ -350,7 +350,6 @@ if_up() {
# Note: ARM users should make use of the DHCP_NOIPV4LL[x]="yes" parameter in rc.inet1.conf - this is the correct
# way to get the behaviour they seek.
[ "${DHCP_NOIPV4LL[$i]}" = "yes" ] && DHCP_OPTIONS+=("-L")
- [ -n "${DHCP_IPADDR[$i]}" ] && DHCP_OPTIONS+=("-r" "${DHCP_IPADDR[$i]}")
echo "${1}: polling for DHCP server"
# 15 seconds should be a reasonable default DHCP timeout. 30 was too much.
debug_log "/sbin/dhcpcd -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS[*]} ${1}"