yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix MAX_NET_IFACES

Browse Source
This commit is contained in:
Ing 2023-04-29 19:39:18 +08:00
parent 9192bb4708
commit c00e7af01f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/board/arpl/overlayfs/opt/arpl/boot.sh
View File

@ -93,7 +93,7 @@ fi
# Validate netif_num # Validate netif_num
MACS=() 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}"]}) [ -n "${CMDLINE["mac${N}"]}" ] && MACS+=(${CMDLINE["mac${N}"]})
done done
NETIF_NUM=${#MACS[*]} NETIF_NUM=${#MACS[*]}

4
files/board/arpl/overlayfs/opt/arpl/menu.sh
View File

@ -393,7 +393,7 @@ function cmdlineMenu() {
;; ;;
c) c)
ETHX=(`ls /sys/class/net/ | grep eth`) # real network cards list 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'`" MACR="`cat /sys/class/net/${ETHX[$(expr ${N} - 1)]}/address | sed 's/://g'`"
MACF=${CMDLINE["mac${N}"]} MACF=${CMDLINE["mac${N}"]}
[ -n "${MACF}" ] && MAC=${MACF} || MAC=${MACR} [ -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}"\ --inputbox "`printf "$(TEXT "Type a custom MAC address of %s")" "mac${N}"`" 0 0 "${MAC}"\
2>${TMP_PATH}/resp 2>${TMP_PATH}/resp
RET=$? RET=$?
[ ${RET} -ne 0 ] && break [ ${RET} -ne 0 ] && break 2
MAC="`<"${TMP_PATH}/resp"`" MAC="`<"${TMP_PATH}/resp"`"
[ -z "${MAC}" ] && MAC="`readConfigKey "original-mac${i}" "${USER_CONFIG_FILE}"`" [ -z "${MAC}" ] && MAC="`readConfigKey "original-mac${i}" "${USER_CONFIG_FILE}"`"
[ -z "${MAC}" ] && MAC="${MACFS[$(expr ${i} - 1)]}" [ -z "${MAC}" ] && MAC="${MACFS[$(expr ${i} - 1)]}"