From 9ba5a77323465fc1af04ab7c696211b2debf1a1f Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Thu, 5 Oct 2023 15:58:32 +0800
Subject: [PATCH] fix something

---
 files/board/arpl/overlayfs/opt/arpl/menu.sh | 2 +-
 img-gen.sh                                  | 6 +++---
 update-check.sh                             | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh
index 67d00216..1335440f 100755
--- a/files/board/arpl/overlayfs/opt/arpl/menu.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh
@@ -114,7 +114,7 @@ function modelMenu() {
           done
         fi
         [ "${DT}" = "true" ] && DT="DT" || DT=""
-        [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"$(printf "\Zb%-12s\Zn \Z4%-2s\Zn" "${PLATFORM}" "${DT}")\" " >>"${TMP_PATH}/menu"
+        [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"$(printf "\Zb%-15s %-2s\Zn" "${PLATFORM}" "${DT}")\" " >>"${TMP_PATH}/menu"
       done < <(cat "${TMP_PATH}/modellist" | sort -r -n -k 2)
       [ ${FLGNEX} -eq 1 ] && echo "f \"\Z1$(TEXT "Disable flags restriction")\Zn\"" >>"${TMP_PATH}/menu"
       [ ${FLGBETA} -eq 0 ] && echo "b \"\Z1$(TEXT "Show all models")\Zn\"" >>"${TMP_PATH}/menu"
diff --git a/img-gen.sh b/img-gen.sh
index bb9d4576..a1e6c974 100755
--- a/img-gen.sh
+++ b/img-gen.sh
@@ -12,9 +12,9 @@ fi
 # Convert po2mo, Get extractor, LKM, addons and Modules
 convertpo2mo "files/board/arpl/overlayfs/opt/arpl/lang"
 getExtractor "files/board/arpl/p3/extractor"
-getLKMs "files/board/arpl/p3/lkms"
-getAddons "files/board/arpl/p3/addons"
-getModules "files/board/arpl/p3/modules"
+getLKMs "files/board/arpl/p3/lkms" true
+getAddons "files/board/arpl/p3/addons" true
+getModules "files/board/arpl/p3/modules" true
 
 # Remove old files
 rm -rf ".buildroot/output/target/opt/arpl"
diff --git a/update-check.sh b/update-check.sh
index 8747d3f4..bcf23c41 100755
--- a/update-check.sh
+++ b/update-check.sh
@@ -25,12 +25,16 @@ if loaderIsConfigured; then
 fi
 
 # 23.9.7
+MAC1="$(readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}")"
 deleteConfigKey "notsetmacs" "${USER_CONFIG_FILE}"
 for N in $(1 8); do
   deleteConfigKey "cmdline.mac${N}" "${USER_CONFIG_FILE}"
   deleteConfigKey "original-mac${N}" "${USER_CONFIG_FILE}"
 done
 deleteConfigKey "cmdline.netif_num" "${USER_CONFIG_FILE}"
-writeConfigKey "mac1" "001132$(printf '%02x%02x%02x' $((${RANDOM} % 256)) $((${RANDOM} % 256)) $((${RANDOM} % 256)))" "${USER_CONFIG_FILE}"
+[ -n "${MAC1}" ] && writeConfigKey "mac1" "${MAC1}" "${USER_CONFIG_FILE}"
+
+MAC1="$(readConfigKey "mac1" "${USER_CONFIG_FILE}")"
+[ -z "${MAC1}" ] && writeConfigKey "mac1" "001132$(printf '%02x%02x%02x' $((${RANDOM} % 256)) $((${RANDOM} % 256)) $((${RANDOM} % 256)))" "${USER_CONFIG_FILE}"
 
 exit 0