From d1700da8cb47cdfbebf448865dea8e7b26577209 Mon Sep 17 00:00:00 2001 From: Darren 'Tadgy' Austin Date: Fri, 7 Aug 2020 02:05:55 +0100 Subject: Update comments regarding use of the hard coded dhcpcd -L command line option. The -L command line option was added to the dhcpcd call in the -current development cycle to assist ARM users with getting networking up and running. This addition was incorrect as rc.inet1 already has support to use or not use -L by setting DHCP_NOIPV4LL[x]="". When I was updating rc.inet1 I took out the -L, but didn't make it clear enough why I had taken it out and how to use the DHCP_NOIP4ALL[x]="" option in rc.inet1.conf. This commit is simply updating that comment to be more verbose. --- rc.inet1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rc.inet1 b/rc.inet1 index 11562a5..f63f93e 100644 --- a/rc.inet1 +++ b/rc.inet1 @@ -343,9 +343,12 @@ if_up() { [ "${DHCP_KEEPNTP[$i]}" = "yes" ] && DHCP_OPTIONS+=("-C" "ntp.conf") [ "${DHCP_KEEPGW[$i]}" = "yes" ] && DHCP_OPTIONS+=("-G") [ "${DHCP_DEBUG[$i]}" = "yes" ] && DHCP_OPTIONS+=("-d") - # The -L option used to be hard coded into the dhcpcd command line in -current. Previous versions did not have - # this hard coded. The code here keeps the 14.2 behaviour, but can be altered to make the use of -L default as - # in -current. To change the behaviour, alter the test to be: [ "${DHCP_NOIPV4LL[$i]}" != "no" ] + # The -L option used to be hard coded into the dhcpcd command line in -current. It was added to assist ARM users + # get networking up and running. Previous versions of Slackware did not have -L hard coded - the code here keeps + # the 14.2 behaviour, but can be altered to make the use of -L default as in -current. To change the behaviour, + # alter the test below to be: [ "${DHCP_NOIPV4LL[$i]}" != "no" ]. + # 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" -- cgit v1.2.3