mgetadmin/arc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arc: rewrite model selection

Browse Source 
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
AuxXxilium
2024-03-30 16:05:58 +01:00
parent d9fe87fdd5
commit 2ea905db0a
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
files/initrd/opt/arc/arc.sh
View File

@@ -121,7 +121,6 @@ function arcModel() {
Y="$(readModelKey "${M}" "disks")"
echo "${M} ${Y}" >>"${TMP_PATH}/modellist"
done <<<$(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sed 's/.*\///; s/\.yml//')
while true; do
echo -n "" >"${TMP_PATH}/menu"
while read -r M Y; do
@@ -131,16 +130,12 @@ function arcModel() {
[[ "${BETA}" = "true" && ${FLGBETA} -eq 0 ]] && continue
DISKS="$(readModelKey "${M}" "disks")-Bay"
ARCCONF="$(readModelKey "${M}" "arc.serial")"
if [ -n "${ARCCONF}" ]; then
ARCAV="Arc"
else
ARCAV="NonArc"
fi
if [[ "${PLATFORM}" = "r1000" || "${PLATFORM}" = "v1000" || "${PLATFORM}" = "epyc7002" ]]; then
CPU="AMD"
else
CPU="Intel"
fi
[ -n "${ARCCONF}" ] && ARC="x" || ARC=""
[[ "${PLATFORM}" = "r1000" || "${PLATFORM}" = "v1000" || "${PLATFORM}" = "epyc7002" ]] && CPU="AMD" || CPU="Intel"
[[ "${PLATFORM}" = "apollolake" || "${PLATFORM}" = "geminilake" || "${PLATFORM}" = "epyc7002" ]] && IGPUS="x" || IGPUS=""
[[ ! "${DT}" = "true" || "${PLATFORM}" = "epyc7002" ]] && HBAS="x" || HBAS=""
[[ "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_CACHE="" || M_2_CACHE="x"
[ "${DT}" = "true" ] && M_2_STORAGE="x" || M_2_STORAGE=""
# Check id model is compatible with CPU
COMPATIBLE=1
if [ ${RESTRICT} -eq 1 ]; then
@@ -157,14 +152,14 @@ function arcModel() {
COMPATIBLE=0
fi
fi
[ "${DT}" = "true" ] && DTO="DT" || DTO=""
[ "${BETA}" = "true" ] && BETA="Beta" || BETA=""
[ ${COMPATIBLE} -eq 1 ] && echo "${M} \"$(printf "\Zb%-7s\Zn \Zb%-6s\Zn \Zb%-13s\Zn \Zb%-3s\Zn \Zb%-7s\Zn \Zb%-4s\Zn" "${DISKS}" "${CPU}" "${PLATFORM}" "${DTO}" "${ARCAV}" "${BETA}")\" ">>"${TMP_PATH}/menu"
[ "${DT}" = "true" ] && DTS="x" || DTS=""
[ "${BETA}" = "true" ] && BETA="x" || BETA=""
[ ${COMPATIBLE} -eq 1 ] && echo "${M} \"$(printf "\Zb%-8s\Zn \Zb%-8s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-4s\Zn" "${DISKS}" "${CPU}" "${PLATFORM}" "${DTS}" "${ARC}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${BETA}")\" ">>"${TMP_PATH}/menu"
done <<<$(cat "${TMP_PATH}/modellist" | sort -n -k 2)
dialog --backtitle "$(backtitle)" --colors \
--cancel-label "Show all" --help-button --help-label "Exit" \
--extra-button --extra-label "Info" \
--menu "Choose Model for Loader" 0 70 0 \
--menu "Choose Model for Loader (This Chart indicates the original Values, without Addons.)\n $(printf "\Zb%-10s\Zn \Zb%-8s\Zn \Zb%-8s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-4s\Zn" "Model" "Disks" "CPU" "Platform" "DT" "Arc" "iGPU" "HBA" "M.2 Cache" "M.2 Volume" "Beta")" 0 105 0 \
--file "${TMP_PATH}/menu" 2>"${TMP_PATH}/resp"
RET=$?
case ${RET} in
@@ -178,7 +173,7 @@ function arcModel() {
RESTRICT=0
;;
2) # help-button -> Exit
return 1
return 0
break
;;
3) # extra-button -> Platform Info