Merge pull request #437 from 007revad/develop

Develop

CHANGES.txt

@@ -1,3 +1,6 @@
+v3.6.111
+- Added support for M.2 volumes for NVMe drives in PCIe adaptor cards for DSM 7.1.1
+
 v3.6.110
 - Bug fix for not finding SAS expansion units. Issue #413
 

syno_hdd_db.sh

@@ -605,8 +605,8 @@ if [[ $buildnumber -gt 64570 ]]; then
     # DSM 7.2.1 and later
     #strgmgr="/var/packages/StorageManager/target/ui/storage_panel.js"
     strgmgr="/usr/local/packages/@appstore/StorageManager/ui/storage_panel.js"
-elif [[ $buildnumber -ge 64561 ]]; then
+elif [[ $buildnumber -ge 42962 ]]; then
-    # DSM 7.2
+    # DSM 7.1.1 to 7.2
     strgmgr="/usr/syno/synoman/webman/modules/StorageManager/storage_panel.js"
 fi
 vidfile="/usr/syno/etc.defaults/pci_vendor_ids.conf"
@@ -730,8 +730,8 @@ if [[ $restore == "yes" ]]; then
         if [[ $buildnumber -gt 64570 ]]; then
             # DSM 7.2.1 and later
             strgmgrver="$(/usr/syno/bin/synopkg version StorageManager)"
-        elif [[ $buildnumber -ge 64561 ]]; then
+        elif [[ $buildnumber -ge 42962 ]]; then
-            # DSM 7.2
+            # DSM 7.1.1 to 7.2
             strgmgrver="${buildnumber}${smallfixnumber}"
         fi
         if [[ -f "${strgmgr}.$strgmgrver" ]]; then
@@ -2221,7 +2221,7 @@ fi
 
 # Enable creating pool on drives in M.2 adaptor card
 if [[ -f "$strgmgr" ]] && [[ $buildnumber -gt 42962 ]]; then
-    # DSM 7.2 and later
+    # DSM 7.1.1 and later
     if [[ ${#m2cards[@]} -gt "0" ]] || [[ $forcepci == "yes" ]]; then
 
         if grep -q 'notSupportM2Pool_addOnCard' "$strgmgr"; then
@@ -2230,8 +2230,8 @@ if [[ -f "$strgmgr" ]] && [[ $buildnumber -gt 42962 ]]; then
             if [[ $buildnumber -gt 64570 ]]; then
                 # DSM 7.2.1 and later
                 strgmgrver="$(/usr/syno/bin/synopkg version StorageManager)"
-            elif [[ $buildnumber -ge 64561 ]]; then
+            elif [[ $buildnumber -ge 42962 ]]; then
-                # DSM 7.2
+                # DSM 7.1.1 to 7.2
                 strgmgrver="${buildnumber}${smallfixnumber}"
             fi