From c00e7af01f2fc1bb7b28a2e02c7eb1fdfeddc100 Mon Sep 17 00:00:00 2001 From: Ing Date: Sat, 29 Apr 2023 19:39:18 +0800 Subject: [PATCH] fix MAX_NET_IFACES --- files/board/arpl/overlayfs/opt/arpl/boot.sh | 2 +- files/board/arpl/overlayfs/opt/arpl/menu.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/board/arpl/overlayfs/opt/arpl/boot.sh b/files/board/arpl/overlayfs/opt/arpl/boot.sh index cd010440..a987e3be 100755 --- a/files/board/arpl/overlayfs/opt/arpl/boot.sh +++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh @@ -93,7 +93,7 @@ fi # Validate netif_num MACS=() -for N in `seq 1 9`; do # Currently, only up to 9 are supported. ( <==> menu.sh L396) +for N in `seq 1 8`; do # Currently, only up to 8 are supported. (<==> menu.sh L396, <==> lkm: MAX_NET_IFACES) [ -n "${CMDLINE["mac${N}"]}" ] && MACS+=(${CMDLINE["mac${N}"]}) done NETIF_NUM=${#MACS[*]} diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index a99b9641..50f31333 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -393,7 +393,7 @@ function cmdlineMenu() { ;; c) ETHX=(`ls /sys/class/net/ | grep eth`) # real network cards list - for N in `seq 1 9`; do # Currently, only up to 9 are supported. ( <==> boot.sh L94) + for N in `seq 1 8`; do # Currently, only up to 8 are supported. (<==> boot.sh L96, <==> lkm: MAX_NET_IFACES) MACR="`cat /sys/class/net/${ETHX[$(expr ${N} - 1)]}/address | sed 's/://g'`" MACF=${CMDLINE["mac${N}"]} [ -n "${MACF}" ] && MAC=${MACF} || MAC=${MACR} @@ -403,7 +403,7 @@ function cmdlineMenu() { --inputbox "`printf "$(TEXT "Type a custom MAC address of %s")" "mac${N}"`" 0 0 "${MAC}"\ 2>${TMP_PATH}/resp RET=$? - [ ${RET} -ne 0 ] && break + [ ${RET} -ne 0 ] && break 2 MAC="`<"${TMP_PATH}/resp"`" [ -z "${MAC}" ] && MAC="`readConfigKey "original-mac${i}" "${USER_CONFIG_FILE}"`" [ -z "${MAC}" ] && MAC="${MACFS[$(expr ${i} - 1)]}"