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

fix models RESTRICT

Browse Source
This commit is contained in:
Ing 2024-05-18 22:14:03 +08:00
parent 2d27db958b
commit 1a0c9e07f5
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/initrd/opt/rr/include/functions.py
View File

@ -161,6 +161,7 @@ def getmodels(platforms=None):
except: except:
pass pass
models.sort(key=lambda x: (x["arch"], x["name"]))
print(json.dumps(models, indent=4)) print(json.dumps(models, indent=4))

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

@ -135,14 +135,16 @@ function modelMenu() {
FLGNEX=0 FLGNEX=0
while read M A; do while read M A; do
COMPATIBLE=1 COMPATIBLE=1
DT="$(readConfigKey "platforms.${A}.dt" "${WORK_PATH}/platforms.yml")" if [ ${RESTRICT} -eq 1 ]; then
FLAGS="$(readConfigArray "platforms.${A}.flags" "${WORK_PATH}/platforms.yml")" for F in $(readConfigArray "platforms.${A}.flags" "${WORK_PATH}/platforms.yml"); do
for F in "${FLAGS}"; do if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
COMPATIBLE=0 COMPATIBLE=0
FLGNEX=1 FLGNEX=1
break break
fi; done fi
[ "${DT}" = "true" ] && DT="DT" || DT="" done
fi
[ "$(readConfigKey "platforms.${A}.dt" "${WORK_PATH}/platforms.yml")" = "true" ] && DT="DT" || DT=""
[ ${COMPATIBLE} -eq 1 ] && echo "${M} \"$(printf "\Zb%-15s %-2s\Zn" "${A}" "${DT}")\" " >>"${TMP_PATH}/menu" [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"$(printf "\Zb%-15s %-2s\Zn" "${A}" "${DT}")\" " >>"${TMP_PATH}/menu"
done <<<$(cat "${TMP_PATH}/modellist") done <<<$(cat "${TMP_PATH}/modellist")
[ ${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"