diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index fc23cc28..288d37b1 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -126,7 +126,6 @@ function arcModel() { while true; do echo -n "" >"${TMP_PATH}/menu" - FLGNEX=0 while read -r M Y; do PLATFORM=$(readModelKey "${M}" "platform") DT="$(readModelKey "${M}" "dt")" @@ -150,13 +149,14 @@ function arcModel() { for F in "$(readModelArray "${M}" "flags")"; do if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then COMPATIBLE=0 - FLGNEX=1 break fi done if [ "${DT}" = "true" ] && [ "${EXTERNALCONTROLLER}" = "true" ]; then COMPATIBLE=0 - FLGNEX=1 + fi + if [[ ${SATACONTROLLER} -eq 0 && "${EXTERNALCONTROLLER}" = "false" && "${M}" != "SA6400" ]]; then + COMPATIBLE=0 fi fi [ "${DT}" = "true" ] && DTO="DT" || DTO="" diff --git a/files/initrd/opt/arc/include/network.sh b/files/initrd/opt/arc/include/network.sh index 9abd10f0..af0acc5d 100755 --- a/files/initrd/opt/arc/include/network.sh +++ b/files/initrd/opt/arc/include/network.sh @@ -43,16 +43,16 @@ function getnet() { 2>"${TMP_PATH}/resp" resp="$(<"${TMP_PATH}/resp")" [ -z "${resp}" ] && return 1 - if [ ${resp} -eq 2 ]; then + if [ ${resp} -eq 1 ]; then writeConfigKey "arc.macsys" "hardware" "${USER_CONFIG_FILE}" - elif [ ${resp} -eq 3 ]; then + elif [ ${resp} -eq 2 ]; then writeConfigKey "arc.macsys" "custom" "${USER_CONFIG_FILE}" fi else # Ask for Macsys dialog --clear --backtitle "$(backtitle)" \ --nocancel --title "Macsys Setting" \ - --menu "Choose an Option\n* Recommended Option" 5 50 0 \ + --menu "Choose an Option\n* Recommended Option" 4 50 0 \ 1 "Hardware - Use Hardware Mac for DSM *" \ 2 "Custom - Use Custom Mac for DSM" \ 2>"${TMP_PATH}/resp"