fix something

This commit is contained in:
Ing 2023-10-05 15:58:32 +08:00
parent 94f363b1dc
commit 9ba5a77323
3 changed files with 9 additions and 5 deletions

View File

@ -114,7 +114,7 @@ function modelMenu() {
done done
fi fi
[ "${DT}" = "true" ] && DT="DT" || DT="" [ "${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) done < <(cat "${TMP_PATH}/modellist" | sort -r -n -k 2)
[ ${FLGNEX} -eq 1 ] && echo "f \"\Z1$(TEXT "Disable flags restriction")\Zn\"" >>"${TMP_PATH}/menu" [ ${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" [ ${FLGBETA} -eq 0 ] && echo "b \"\Z1$(TEXT "Show all models")\Zn\"" >>"${TMP_PATH}/menu"

View File

@ -12,9 +12,9 @@ fi
# Convert po2mo, Get extractor, LKM, addons and Modules # Convert po2mo, Get extractor, LKM, addons and Modules
convertpo2mo "files/board/arpl/overlayfs/opt/arpl/lang" convertpo2mo "files/board/arpl/overlayfs/opt/arpl/lang"
getExtractor "files/board/arpl/p3/extractor" getExtractor "files/board/arpl/p3/extractor"
getLKMs "files/board/arpl/p3/lkms" getLKMs "files/board/arpl/p3/lkms" true
getAddons "files/board/arpl/p3/addons" getAddons "files/board/arpl/p3/addons" true
getModules "files/board/arpl/p3/modules" getModules "files/board/arpl/p3/modules" true
# Remove old files # Remove old files
rm -rf ".buildroot/output/target/opt/arpl" rm -rf ".buildroot/output/target/opt/arpl"

View File

@ -25,12 +25,16 @@ if loaderIsConfigured; then
fi fi
# 23.9.7 # 23.9.7
MAC1="$(readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}")"
deleteConfigKey "notsetmacs" "${USER_CONFIG_FILE}" deleteConfigKey "notsetmacs" "${USER_CONFIG_FILE}"
for N in $(1 8); do for N in $(1 8); do
deleteConfigKey "cmdline.mac${N}" "${USER_CONFIG_FILE}" deleteConfigKey "cmdline.mac${N}" "${USER_CONFIG_FILE}"
deleteConfigKey "original-mac${N}" "${USER_CONFIG_FILE}" deleteConfigKey "original-mac${N}" "${USER_CONFIG_FILE}"
done done
deleteConfigKey "cmdline.netif_num" "${USER_CONFIG_FILE}" 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 exit 0