From f936e463c952ec0906dc32bc5bdebdea6ccd6880 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Mon, 1 Jul 2024 20:07:10 +0200 Subject: [PATCH] arc: rewrite model selection Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 6628f355..9f9a8d79 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -130,7 +130,8 @@ function arcModel() { BETA="" [ -n "${ARCCONF}" ] && ARC="x" || ARC="" [ "${DT}" == "true" ] && DTS="x" || DTS="" - [[ "${A}" == "apollolake" || "${A}" == "geminilake" || "${A}" == "epyc7002" ]] && IGPUS="x" || IGPUS="" + IGPUS="" + [[ "${A}" == "apollolake" || "${A}" == "geminilake" ]] && IGPUS="up to 10th" || "${A}" == "epyc7002" ]] && IGPUS="up to 14th" [ "${DT}" == "true" ] && HBAS="" || HBAS="x" [ "${M}" == "SA6400" ] && HBAS="x" [ "${DT}" == "false" ] && USBS="x" || USBS="" @@ -160,22 +161,22 @@ function arcModel() { [ -n "$(grep -w "${M}" "${S_FILE}")" ] && BETA="Arc" || BETA="Syno" [ -z "$(grep -w "${A}" "${P_FILE}")" ] && COMPATIBLE=0 if [ -n "${ARC_KEY}" ]; then - [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${ARC}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu" + [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${ARC}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu" else - [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu" + [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu" fi done < <(cat "${TMP_PATH}/modellist") if [ -n "${ARC_KEY}" ]; then dialog --backtitle "$(backtitle)" --title "Arc DSM Model" --colors \ --cancel-label "Show all" --help-button --help-label "Exit" \ --extra-button --extra-label "Info" \ - --menu "Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" 0 110 0 \ + --menu "Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "i915" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" 0 110 0 \ --file "${TMP_PATH}/menu" 2>"${TMP_PATH}/resp" else dialog --backtitle "$(backtitle)" --title "DSM Model" --colors \ --cancel-label "Show all" --help-button --help-label "Exit" \ --extra-button --extra-label "Info" \ - --menu "Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" 0 110 0 \ + --menu "Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "i915" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" 0 110 0 \ --file "${TMP_PATH}/menu" 2>"${TMP_PATH}/resp" fi RET=$? @@ -576,6 +577,8 @@ function arcSummary() { SUMMARY+="\n>> Addons: \Zb${ADDONSINFO}\Zn" SUMMARY+="\n" SUMMARY+="\n\Z4> Device Information\Zn" + SUMMARY+="\n>> AES | ACPI: \Zb${AESSYS} | ${ACPISYS}\Zn" + SUMMARY+="\n>> CPU Scaling: \Zb${CPUFREQ}\Zn" SUMMARY+="\n>> NIC: \Zb${NIC}\Zn" SUMMARY+="\n>> Disks (incl. USB): \Zb${DRIVES}\Zn" SUMMARY+="\n>> Disks (internal): \Zb${HARDDRIVES}\Zn"