From 33a3d0b88fb2a7ec05e5ad593b7c4172be6a57db Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Tue, 15 Oct 2024 14:59:36 +0800
Subject: [PATCH] Refactor menu.sh to add DSM storage pool mounting
 functionality and update network drivers

---
 files/initrd/opt/rr/menu.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh
index 294ee7f9..4a103285 100755
--- a/files/initrd/opt/rr/menu.sh
+++ b/files/initrd/opt/rr/menu.sh
@@ -185,6 +185,7 @@ function modelMenu() {
     NETIF_NUM=2
     MACS=($(generateMacAddress "${MODEL}" ${NETIF_NUM}))
     for I in $(seq 1 ${NETIF_NUM}); do
+      eval MAC${I}="${MACS[$((${I} - 1))]}"
       writeConfigKey "mac${I}" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}"
     done
     writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
@@ -374,6 +375,7 @@ function setConfigFromDSM() {
   NETIF_NUM=2
   MACS=($(generateMacAddress "${MODEL}" ${NETIF_NUM}))
   for I in $(seq 1 ${NETIF_NUM}); do
+    eval MAC${I}="${MACS[$((${I} - 1))]}"
     writeConfigKey "mac${I}" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}"
   done
 
@@ -1966,7 +1968,7 @@ function addNewDSMUser() {
   fi
   MSG="$(TEXT "Add to administrators group by default")"
   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"
   [ $? -ne 0 ] && return
   username="$(cat "${TMP_PATH}/resp" | sed -n '1p')"