diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 00775cc0..1edfbcab 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -140,6 +140,7 @@ function arcModel() { [ -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}" = "false" || "${PLATFORM}" = "epyc7002" ]] && HBAS="x" || HBAS="" [ "${DT}" = "false" ] && USBS="x" || USBS="" [[ "${M}" = "DS220+" || "${M}" = "DS224+" || "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_CACHE="" || M_2_CACHE="x" [[ "${DT}" = "true" && "${M}" != "DS220+" && "${M}" != "DS224+" ]] && M_2_STORAGE="x" || M_2_STORAGE="" @@ -161,12 +162,12 @@ function arcModel() { fi [ "${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%-10s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-4s\Zn" "${DISKS}" "${CPU}" "${PLATFORM}" "${DTS}" "${ARC}" "${IGPUS}" "${USBS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${BETA}")\" ">>"${TMP_PATH}/menu" + [ ${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%-10s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-4s\Zn" "${DISKS}" "${CPU}" "${PLATFORM}" "${DTS}" "${ARC}" "${IGPUS}" "${USBS}" "${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 (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%-10s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-4s\Zn" "Model" "Disks" "CPU" "Platform" "DT" "Arc" "iGPU" "USB Mount" "M.2 Cache" "M.2 Volume" "Beta")" 0 110 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%-10s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-4s\Zn" "Model" "Disks" "CPU" "Platform" "DT" "Arc" "iGPU" "USB Mount" "HBA" "M.2 Cache" "M.2 Volume" "Beta")" 0 115 0 \ --file "${TMP_PATH}/menu" 2>"${TMP_PATH}/resp" RET=$? case ${RET} in diff --git a/files/initrd/opt/arc/informations/apollolake.yml b/files/initrd/opt/arc/informations/apollolake.yml index b3e3fb96..2c48bc55 100644 --- a/files/initrd/opt/arc/informations/apollolake.yml +++ b/files/initrd/opt/arc/informations/apollolake.yml @@ -1,7 +1,8 @@ - Hardwaresupport for Intel (may work on AMD) - Up to 8 Threads - Possible to get i915 (Intel Graphics up to 10th Gen) working -- Support for RAID/SCSI/HBA Controller +- Support for HBA Controller +- Support for RAID/SCSI Controller - USB Storage as Internal or External - Support for SATA Controller - NVMe Cache working diff --git a/files/initrd/opt/arc/informations/broadwell.yml b/files/initrd/opt/arc/informations/broadwell.yml index 65eaf57a..221acc70 100644 --- a/files/initrd/opt/arc/informations/broadwell.yml +++ b/files/initrd/opt/arc/informations/broadwell.yml @@ -1,6 +1,7 @@ - Hardwaresupport for Intel (may work on AMD eq. HP Microserver Gen7) - Up to 16 Threads -- Support for RAID/SCSI/HBA Controller +- Support for HBA Controller +- Support for RAID/SCSI Controller - USB Storage as Internal or External - Support for SATA Controller - NVMe Cache working diff --git a/files/initrd/opt/arc/informations/broadwellnk.yml b/files/initrd/opt/arc/informations/broadwellnk.yml index b9805b98..1e3af167 100644 --- a/files/initrd/opt/arc/informations/broadwellnk.yml +++ b/files/initrd/opt/arc/informations/broadwellnk.yml @@ -1,6 +1,7 @@ - Hardwaresupport for Intel (may work on AMD eq. HP Microserver Gen7) - Up to 24 Threads -- Support for RAID/SCSI/HBA Controller +- Support for HBA Controller +- Support for RAID/SCSI Controller - USB Storage as Internal or External - Support for SATA Controller - NVMe Cache working diff --git a/files/initrd/opt/arc/informations/broadwellnkv2.yml b/files/initrd/opt/arc/informations/broadwellnkv2.yml index a6da316f..7ff1a651 100644 --- a/files/initrd/opt/arc/informations/broadwellnkv2.yml +++ b/files/initrd/opt/arc/informations/broadwellnkv2.yml @@ -1,7 +1,6 @@ - Hardwaresupport for Intel (may work on AMD) - Up to 24 Threads - Support for SATA Controller -- Support for HBA Controller - No Support for RAID/SCSI Controller - USB Storage as External - NVMe Cache working diff --git a/files/initrd/opt/arc/informations/denverton.yml b/files/initrd/opt/arc/informations/denverton.yml index e5990ce4..959fd564 100644 --- a/files/initrd/opt/arc/informations/denverton.yml +++ b/files/initrd/opt/arc/informations/denverton.yml @@ -1,6 +1,7 @@ - Hardwaresupport for Intel (may work on AMD) - Up to 16 Threads -- Support for RAID/SCSI/HBA Controller +- Support for HBA Controller +- Support for RAID/SCSI Controller - USB Storage as Internal or External - CPU need FMA3/MOVBE Instructions - Some Nvidia Graphics are working. If not, use Community Package. diff --git a/files/initrd/opt/arc/informations/geminilake.yml b/files/initrd/opt/arc/informations/geminilake.yml index 06e68d23..1167b127 100644 --- a/files/initrd/opt/arc/informations/geminilake.yml +++ b/files/initrd/opt/arc/informations/geminilake.yml @@ -2,7 +2,6 @@ - Up to 8 Threads - Possible to get i915 (Intel Graphics up to 10th Gen) working - Support for SATA Controller -- Support for HBA Controller - No Support for RAID/SCSI Controller - USB Storage as External - NVMe Cache working diff --git a/files/initrd/opt/arc/informations/purley.yml b/files/initrd/opt/arc/informations/purley.yml index 509166a1..de503bbe 100644 --- a/files/initrd/opt/arc/informations/purley.yml +++ b/files/initrd/opt/arc/informations/purley.yml @@ -1,7 +1,6 @@ - Hardwaresupport for Intel (may work on AMD) - Up to 64 Threads - Support for SATA Controller -- Support for HBA Controller - No Support for RAID/SCSI Controller - USB Storage as External - NVMe Cache working diff --git a/files/initrd/opt/arc/informations/r1000.yml b/files/initrd/opt/arc/informations/r1000.yml index 9b844401..df65fecc 100644 --- a/files/initrd/opt/arc/informations/r1000.yml +++ b/files/initrd/opt/arc/informations/r1000.yml @@ -1,7 +1,6 @@ - Hardwaresupport for AMD (may work on Intel) - Up to 16 Threads - Support for SATA Controller -- Support for HBA Controller - No Support for RAID/SCSI Controller - USB Storage as External - NVMe Cache working diff --git a/files/initrd/opt/arc/informations/v1000.yml b/files/initrd/opt/arc/informations/v1000.yml index 9b844401..df65fecc 100644 --- a/files/initrd/opt/arc/informations/v1000.yml +++ b/files/initrd/opt/arc/informations/v1000.yml @@ -1,7 +1,6 @@ - Hardwaresupport for AMD (may work on Intel) - Up to 16 Threads - Support for SATA Controller -- Support for HBA Controller - No Support for RAID/SCSI Controller - USB Storage as External - NVMe Cache working