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

Refactor menu.sh to add DSM storage pool mounting functionality and update network drivers

Browse Source
This commit is contained in:
Ing 2024-10-15 14:59:36 +08:00
parent d2d9728bb3
commit 33a3d0b88f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/initrd/opt/rr/menu.sh
View File

@ -185,6 +185,7 @@ function modelMenu() {
NETIF_NUM=2 NETIF_NUM=2
MACS=($(generateMacAddress "${MODEL}" ${NETIF_NUM})) MACS=($(generateMacAddress "${MODEL}" ${NETIF_NUM}))
for I in $(seq 1 ${NETIF_NUM}); do for I in $(seq 1 ${NETIF_NUM}); do
eval MAC${I}="${MACS[$((${I} - 1))]}"
writeConfigKey "mac${I}" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}" writeConfigKey "mac${I}" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}"
done done
writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}" writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
@ -374,6 +375,7 @@ function setConfigFromDSM() {
NETIF_NUM=2 NETIF_NUM=2
MACS=($(generateMacAddress "${MODEL}" ${NETIF_NUM})) MACS=($(generateMacAddress "${MODEL}" ${NETIF_NUM}))
for I in $(seq 1 ${NETIF_NUM}); do for I in $(seq 1 ${NETIF_NUM}); do
eval MAC${I}="${MACS[$((${I} - 1))]}"
writeConfigKey "mac${I}" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}" writeConfigKey "mac${I}" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}"
done done
@ -1966,7 +1968,7 @@ function addNewDSMUser() {
fi fi
MSG="$(TEXT "Add to administrators group by default")" MSG="$(TEXT "Add to administrators group by default")"
DIALOG --title "$(TEXT "Advanced")" \ DIALOG --title "$(TEXT "Advanced")" \
--form "${MSG}" 8 60 3 "username:" 1 1 "${sn}" 1 10 50 0 "password:" 2 1 "${mac1}" 2 10 50 0 \ --form "${MSG}" 8 60 3 "username:" 1 1 "" 1 10 50 0 "password:" 2 1 "" 2 10 50 0 \
2>"${TMP_PATH}/resp" 2>"${TMP_PATH}/resp"
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
username="$(cat "${TMP_PATH}/resp" | sed -n '1p')" username="$(cat "${TMP_PATH}/resp" | sed -n '1p')"