arc: remove custom kernel if 7.2.2 is selected

Signed-off-by: AuxXxilium <[email protected]>
AuxXxilium · Aug 26, 2024 · 9e34bc7 · 9e34bc7
1 parent 9f2485a
commit 9e34bc7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh
@@ -52,6 +52,8 @@ function addonSelection() {
     arrayExistItem "${ADDON}" "${!ADDONS[@]}" && ACT="on" || ACT="off"
     if [[ "${ADDON}" == "amepatch" || "${ADDON}" == "sspatch" || "${ADDON}" == "arcdns" ]] && [ "${ARCPATCH}" == "false" ]; then
       continue
+    elif [[ "${ADDON}" == "amepatch" || "${ADDON}" == "sspatch" || "${ADDON}" == "photosfacepatch" || "${ADDON}" == "remotefs" ]] && [ "${NANOVER}" == "2" ]; then
+      continue
     elif [ "${ADDON}" == "cpufreqscaling" ] && [ "${CPUFREQ}" == "false" ]; then
       continue
     else
@@ -71,14 +73,8 @@ function addonSelection() {
     writeConfigKey "addons.\"${ADDON}\"" "" "${USER_CONFIG_FILE}"
   done
   ADDONSINFO="$(readConfigEntriesArray "addons" "${USER_CONFIG_FILE}")"
-  if [ "${NANOVER}" == "2" ]; then
-    ADDONSINFO+="\n\nWARN: DSM 7.2.2 isn't supported by app-specific Addons!"
-    dialog --backtitle "$(backtitle)" --title "DSM Addons" \
-      --msgbox "DSM Addons selected:\n${ADDONSINFO}" 10 60
-  else
-    dialog --backtitle "$(backtitle)" --title "DSM Addons" \
-      --msgbox "DSM Addons selected:\n${ADDONSINFO}" 7 50
-  fi
+  dialog --backtitle "$(backtitle)" --title "DSM Addons" \
+    --msgbox "DSM Addons selected:\n${ADDONSINFO}" 7 50
 }
 
 ###############################################################################

diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
@@ -1032,7 +1032,7 @@ else
         echo "N \"Add new User\" "                                                            >>"${TMP_PATH}/menu"
         echo "D \"StaticIP \" "                                                               >>"${TMP_PATH}/menu"
         echo "J \"Reset DSM Network Config \" "                                               >>"${TMP_PATH}/menu"
-        if [ "${PLATFORM}" == "epyc7002" ]; then
+        if [ "${PLATFORM}" == "epyc7002" ] && [ "${NANOVER}" == "1"]; then
           echo "K \"Kernel: \Z4${KERNEL}\Zn \" "                                              >>"${TMP_PATH}/menu"
         fi
         if [ "${DT}" == "true" ]; then