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

修复 MACS 设置错误

Browse Source
This commit is contained in:
Ing 2025-05-08 20:25:58 +08:00
parent ac99d1ea51
commit eb7a015003
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
files/initrd/opt/rr/boot.sh
View File

@ -156,8 +156,6 @@ if [ -z "${MAC1}" ]; then
MAC2="" MAC2=""
writeConfigKey "mac1" "${MAC1}" "${USER_CONFIG_FILE}" writeConfigKey "mac1" "${MAC1}" "${USER_CONFIG_FILE}"
writeConfigKey "mac2" "${MAC2}" "${USER_CONFIG_FILE}" writeConfigKey "mac2" "${MAC2}" "${USER_CONFIG_FILE}"
CMDLINE['mac1']="${MAC1}"
CMDLINE['netif_num']="0"
else else
NETIF_NUM=2 NETIF_NUM=2
MACS="$(generateMacAddress "${MODEL}" ${NETIF_NUM})" MACS="$(generateMacAddress "${MODEL}" ${NETIF_NUM})"
@ -165,11 +163,10 @@ if [ -z "${MAC1}" ]; then
eval MAC${I}="$(echo ${MACS} | cut -d' ' -f${I})" eval MAC${I}="$(echo ${MACS} | cut -d' ' -f${I})"
writeConfigKey "mac${I}" "$(echo ${MACS} | cut -d' ' -f${I})" "${USER_CONFIG_FILE}" writeConfigKey "mac${I}" "$(echo ${MACS} | cut -d' ' -f${I})" "${USER_CONFIG_FILE}"
done done
CMDLINE['mac1']="${MAC1}"
CMDLINE['mac2']="${MAC2}"
CMDLINE['netif_num']="${NETIF_NUM}"
fi fi
fi fi
[ -n "${MAC1}" ] && CMDLINE['mac1']="${MAC1}" && CMDLINE['netif_num']="1"
[ -n "${MAC2}" ] && CMDLINE['mac2']="${MAC2}" && CMDLINE['netif_num']="2"
CMDLINE['skip_vender_mac_interfaces']="$(seq -s, 0 $((${CMDLINE['netif_num']:-1} - 1)))" CMDLINE['skip_vender_mac_interfaces']="$(seq -s, 0 $((${CMDLINE['netif_num']:-1} - 1)))"