scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 17:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

initrds: ifup: Move NETRETRIES handling to "dhcp" code path

Browse Source 
This variable is only required and used for dynamic network configs:
validating and configuring it for rest of the paths isn't necessary.

While there split warning message to two lines to make code and
runtime output more readable.

Signed-off-by: Sergey Popovich <sergey.popovich@ordnance.co>
This commit is contained in:
Sergey Popovich
2018-08-06 09:26:25 +03:00
parent cdad662745
commit e2c1fcc335
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/base/all/initrds/loader-initrd-files/src/bin/ifup
View File

@@ -44,18 +44,21 @@ if [ "${NETHW}" ]; then
ip link set dev ${NETDEV} addr ${NETHW}
fi
# Default DHCP timeout is 10 requests in 10 seconds.
NETRETRIES_DEFAULT=10
NETRETRIES=${NETRETRIES:-$NETRETRIES_DEFAULT}
if [ "$NETRETRIES" = "infinite" ]; then
NETRETRIES=
elif [ $(echo "$NETRETRIES" | tr -d '[:digit:]') ] || [ "$NETRETRIES" -lt 0 ]; then
echo "Warning: the NETRETRIES setting is currently '$NETRETRIES'. This is invalid and the default value of $NETRETRIES_DEFAULT will be used instead."
NETRETRIES=$NETRETRIES_DEFAULT
fi
case "${NETAUTO}" in
dhcp|auto)
# Default DHCP timeout is 10 requests in 10 seconds.
NETRETRIES_DEFAULT=10
NETRETRIES=${NETRETRIES:-$NETRETRIES_DEFAULT}
if [ "$NETRETRIES" = "infinite" ]; then
NETRETRIES=
elif [ $(echo "$NETRETRIES" | tr -d '[:digit:]') ] || [ "$NETRETRIES" -lt 0 ]; then
echo "Warning: the NETRETRIES setting is currently '$NETRETRIES'."
echo "This is invalid and the default value of $NETRETRIES_DEFAULT will be used instead."
NETRETRIES=$NETRETRIES_DEFAULT
fi
echo 1 >/proc/sys/net/ipv6/conf/${NETDEV}/autoconf
if [ -n "${NETRETRIES}" ]; then
if ! udhcpc --retries $NETRETRIES --now -i ${NETDEV}; then
echo "**********************************************************************"