diff options
| author | Darren 'Tadgy' Austin <darren@afterdark.org.uk> | 2023-06-21 14:36:55 +0100 |
|---|---|---|
| committer | Darren 'Tadgy' Austin <darren@afterdark.org.uk> | 2023-06-21 14:36:55 +0100 |
| commit | 76218fa6e7c097c875af2a29cc7670995bef2ae4 (patch) | |
| tree | 4616f24bcfe8e4ee5c21e2691d68ecc95ce4aa93 | |
| parent | 88009f03fa16d64837f996669190cc69de75f7c5 (diff) | |
| download | slacknetsetup-76218fa6e7c097c875af2a29cc7670995bef2ae4.tar.xz | |
Re-add support for the DHCP_IPADDR parameter from rc.inet1.conf.
During the last major updates, somehow the DHCP_IPADDR option
got missed while I re-implemented the options handling.
This commit re-adds the support for that option.
Note that this commit changes the previously used '-s' dhcpcd
option with the '-r' option as this seems more appropriate.
| -rw-r--r-- | rc.inet1 | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -398,6 +398,7 @@ if_up() { [ "${DHCP_KEEPRESOLV[$i]}" = "yes" ] && DHCP_OPTIONS+=("-C" "resolv.conf") [ "${DHCP_KEEPNTP[$i]}" = "yes" ] && DHCP_OPTIONS+=("-C" "ntp.conf") [ "${DHCP_KEEPGW[$i]}" = "yes" ] && DHCP_OPTIONS+=("-G") + [ -n "${DHCP_IPADDR[$i]}" ] && DHCP_OPTIONS+=("-r" "${DHCP_IPADDR[$i]}") [ "${DHCP_DEBUG[$i]}" = "yes" ] && DHCP_OPTIONS+=("-d") # 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 |