From 3a264a695b476ef795bd44d9851e9297ab4bc35e Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Thu, 30 Nov 2023 16:23:06 +1100
Subject: [PATCH] Update syno_hdd_db.sh

Bug fix to prevent enabling supportnvme and support_m2_pool on models with no M.2 slots or PCIe ports.
---
 syno_hdd_db.sh | 92 ++++++++++++++++++++++++++------------------------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
index bb8fb5d..0a892a4 100644
--- a/syno_hdd_db.sh
+++ b/syno_hdd_db.sh
@@ -1574,61 +1574,65 @@ fi
 
 
 # Enable nvme support
-if [[ $m2 != "no" ]]; then
-    # Check if nvme support is enabled
-    setting="$(get_key_value $synoinfo supportnvme)"
-    enabled=""
-    if [[ ! $setting ]]; then
-        # Add supportnvme="yes"
-        synosetkeyvalue "$synoinfo" supportnvme "yes"
-        enabled="yes"
-    elif [[ $setting == "no" ]]; then
-        # Change supportnvme="no" to "yes"
-        synosetkeyvalue "$synoinfo" supportnvme "yes"
-        enabled="yes"
-    elif [[ $setting == "yes" ]]; then
-        echo -e "\nNVMe support already enabled."
-    fi
-
-    # Check if we enabled nvme support
-    setting="$(get_key_value $synoinfo supportnvme)"
-    if [[ $enabled == "yes" ]]; then
-        if [[ $setting == "yes" ]]; then
-            echo -e "\nEnabled NVMe support."
-        else
-            echo -e "\n${Error}ERROR${Off} Failed to enable NVMe support!"
-        fi
-    fi
-fi
-
-
-# Enable m2 volume support
-if [[ $m2 != "no" ]]; then
-    if [[ $m2exists == "yes" ]]; then
-        # Check if m2 volume support is enabled
-        smp=support_m2_pool
-        setting="$(get_key_value $synoinfo ${smp})"
+if ls /dev | grep nvme >/dev/null ; then
+    if [[ $m2 != "no" ]]; then
+        # Check if nvme support is enabled
+        setting="$(get_key_value $synoinfo supportnvme)"
         enabled=""
         if [[ ! $setting ]]; then
-            # Add support_m2_pool="yes"
-            #echo 'support_m2_pool="yes"' >> "$synoinfo"
-            synosetkeyvalue "$synoinfo" "$smp" "yes"
+            # Add supportnvme="yes"
+            synosetkeyvalue "$synoinfo" supportnvme "yes"
             enabled="yes"
         elif [[ $setting == "no" ]]; then
-            # Change support_m2_pool="no" to "yes"
-            synosetkeyvalue "$synoinfo" "$smp" "yes"
+            # Change supportnvme="no" to "yes"
+            synosetkeyvalue "$synoinfo" supportnvme "yes"
             enabled="yes"
         elif [[ $setting == "yes" ]]; then
-            echo -e "\nM.2 volume support already enabled."
+            echo -e "\nNVMe support already enabled."
         fi
 
-        # Check if we enabled m2 volume support
-        setting="$(get_key_value $synoinfo ${smp})"
+        # Check if we enabled nvme support
+        setting="$(get_key_value $synoinfo supportnvme)"
         if [[ $enabled == "yes" ]]; then
             if [[ $setting == "yes" ]]; then
-                echo -e "\nEnabled M.2 volume support."
+                echo -e "\nEnabled NVMe support."
             else
-                echo -e "\n${Error}ERROR${Off} Failed to enable m2 volume support!"
+                echo -e "\n${Error}ERROR${Off} Failed to enable NVMe support!"
+            fi
+        fi
+    fi
+fi
+
+
+# Enable m2 volume support
+if ls /dev | grep nv[em] >/dev/null ; then
+    if [[ $m2 != "no" ]]; then
+        if [[ $m2exists == "yes" ]]; then
+            # Check if m2 volume support is enabled
+            smp=support_m2_pool
+            setting="$(get_key_value $synoinfo ${smp})"
+            enabled=""
+            if [[ ! $setting ]]; then
+                # Add support_m2_pool="yes"
+                #echo 'support_m2_pool="yes"' >> "$synoinfo"
+                synosetkeyvalue "$synoinfo" "$smp" "yes"
+                enabled="yes"
+            elif [[ $setting == "no" ]]; then
+                # Change support_m2_pool="no" to "yes"
+                synosetkeyvalue "$synoinfo" "$smp" "yes"
+                enabled="yes"
+            elif [[ $setting == "yes" ]]; then
+                echo -e "\nM.2 volume support already enabled."
+            fi
+
+            # Check if we enabled m2 volume support
+            setting="$(get_key_value $synoinfo ${smp})"
+            if [[ $enabled == "yes" ]]; then
+                if [[ $setting == "yes" ]]; then
+                    echo -e "\nEnabled M.2 volume support."
+                else
+                    echo -e "\n${Error}ERROR${Off} Failed to enable m2 volume support!"
+                fi
             fi
         fi
     fi