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

Merge pull request #66 from fbelavenuto/dev

Browse Source 
Addons misc and acpid installed by default
This commit is contained in:
Fabio Belavenuto 2022-08-01 14:20:09 -03:00 committed by GitHub
commit ad80a9d740
2 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/board/arpl/overlayfs/opt/arpl/init.sh
View File

@ -56,6 +56,8 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
writeConfigKey "cmdline" "{}" "${USER_CONFIG_FILE}" writeConfigKey "cmdline" "{}" "${USER_CONFIG_FILE}"
writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}" writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}" writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
fi fi
# Set custom MAC if defined # Set custom MAC if defined

23
files/board/arpl/overlayfs/opt/arpl/menu.sh
View File

@ -58,7 +58,10 @@ function backtitle() {
############################################################################### ###############################################################################
# Shows available models to user choose one # Shows available models to user choose one
function modelMenu() { function modelMenu() {
ITEMS="" RESTRICT=1
while true; do
echo "" > "${TMP_PATH}/menu"
FLGNEX=0
while read M; do while read M; do
M="`basename ${M}`" M="`basename ${M}`"
M="${M::-4}" M="${M::-4}"
@ -66,20 +69,28 @@ function modelMenu() {
DT="`readModelKey "${M}" "dt"`" DT="`readModelKey "${M}" "dt"`"
# Check id model is compatible with CPU # Check id model is compatible with CPU
COMPATIBLE=1 COMPATIBLE=1
if [ ${RESTRICT} -eq 1 ]; then
for F in `readModelArray "${M}" "flags"`; do for F in `readModelArray "${M}" "flags"`; do
if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
COMPATIBLE=0 COMPATIBLE=0
FLGNEX=1
break break
fi fi
done done
fi
[ "${DT}" = "true" ] && DT="-DT" || DT="" [ "${DT}" = "true" ] && DT="-DT" || DT=""
[ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} \Zb${PLATFORM}${DT}\Zn " [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"\Zb${PLATFORM}${DT}\Zn\" " >> "${TMP_PATH}/menu"
done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort) done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
[ ${FLGNEX} -eq 1 ] && echo "f \"\Z1Disable flags restriction\Zn\"" >> "${TMP_PATH}/menu"
dialog --backtitle "`backtitle`" --colors --menu "Choose the model" 0 0 0 \ dialog --backtitle "`backtitle`" --colors --menu "Choose the model" 0 0 0 \
${ITEMS} 2>${TMP_PATH}/resp --file "${TMP_PATH}/menu" 2>${TMP_PATH}/resp
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
resp=$(<${TMP_PATH}/resp) resp=$(<${TMP_PATH}/resp)
[ -z "${resp}" ] && return [ -z "${resp}" ] && return
if [ "${resp}" = "f" ]; then
RESTRICT=0
continue
fi
# If user change model, clean buildnumber and S/N # If user change model, clean buildnumber and S/N
if [ "${MODEL}" != "${resp}" ]; then if [ "${MODEL}" != "${resp}" ]; then
MODEL=${resp} MODEL=${resp}
@ -92,6 +103,8 @@ function modelMenu() {
rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}" rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
DIRTY=1 DIRTY=1
fi fi
break
done
} }
############################################################################### ###############################################################################
@ -326,7 +339,7 @@ function cmdlineMenu() {
fi fi
ITEMS="" ITEMS=""
for I in "${!CMDLINE[@]}"; do for I in "${!CMDLINE[@]}"; do
ITEMS+="${I} ${CMDLINE[${I}]} off " [ -z "${CMDLINE[${I}]}" ] && ITEMS+="${I} \"\" off " || ITEMS+="${I} ${CMDLINE[${I}]} off "
done done
dialog --backtitle "`backtitle`" \ dialog --backtitle "`backtitle`" \
--checklist "Select cmdline to remove" 0 0 0 ${ITEMS} \ --checklist "Select cmdline to remove" 0 0 0 ${ITEMS} \
@ -459,7 +472,7 @@ function synoinfoMenu() {
fi fi
ITEMS="" ITEMS=""
for I in "${!SYNOINFO[@]}"; do for I in "${!SYNOINFO[@]}"; do
ITEMS+="${I} ${SYNOINFO[${I}]} off " [ -z "${SYNOINFO[${I}]}" ] && ITEMS+="${I} \"\" off " || ITEMS+="${I} ${SYNOINFO[${I}]} off "
done done
dialog --backtitle "`backtitle`" \ dialog --backtitle "`backtitle`" \
--checklist "Select synoinfo entry to remove" 0 0 0 ${ITEMS} \ --checklist "Select synoinfo entry to remove" 0 0 0 ${ITEMS} \