From 8d8454ebd4fe51b9eafe34b7623c410f14de8bfc Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Mon, 1 Jul 2024 20:34:41 +0200 Subject: [PATCH] arc: fix model selection Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index dcc68fd1..0ead4195 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -131,7 +131,8 @@ function arcModel() { [ -n "${ARCCONF}" ] && ARC="x" || ARC="" [ "${DT}" == "true" ] && DTS="x" || DTS="" IGPUS="" - [[ "${A}" == "apollolake" || "${A}" == "geminilake" ]] && IGPUS="up to 10th" || "${A}" == "epyc7002" ]] && IGPUS="up to 14th" + [[ "${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="" @@ -163,20 +164,20 @@ function arcModel() { if [ -n "${ARC_KEY}" ]; then [ ${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%-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" + [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\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" 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%-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 \ + --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%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "iGPU/i915" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" 0 112 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%-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 \ + --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%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "iGPU/i915" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" 0 112 0 \ --file "${TMP_PATH}/menu" 2>"${TMP_PATH}/resp" fi RET=$?