Merge pull request #49 from 007revad/develop

Develop

CHANGES.txt

@@ -1,3 +1,8 @@
+v3.1.16
+- Made checking if Synology has a PCIe x8 slot more reliable.
+- Bug fix for false "Failed to delete tmp files" log entries
+  - Bug first appeared in v3.0.11
+
 v3.1.15
 - Added check that synonvme exists.
 - Added check that libsynonvme.so exists.

README.md

@@ -17,6 +17,8 @@ Allows using E10M20-T1, M2D20, M2D18 or M2D17 cards in Synology NAS models that
   - Enables M2D18 and M2D17 for RS822RP+, RS822+, RS1221RP+ and RS1221+ using DSM 7.1.1 and older.
   - May enable E10M20-T1, M2D20, M2D18 and M2D17 for other models with a PCIe x8 slot that have /usr/syno/synonvme.
 
+**Note:** M.2 SATA SSD drives do not work in DSM 7.2 so enabling the M2D17 is pointless.
+
 [Synology HDD db](https://github.com/007revad/Synology_HDD_db) now enables using Storage Manager to create volumes on M.2 drives in a PCIe M.2 adaptor card.
 
 <br>

syno_enable_m2_card.sh

@@ -12,7 +12,7 @@
 # sudo -i /volume1/scripts/syno_enable_m2_card.sh
 #-----------------------------------------------------------------------------------
 
-scriptver="v3.1.15"
+scriptver="v3.1.16"
 script=Synology_enable_M2_card
 repo="007revad/Synology_enable_M2_card"
 scriptname=syno_enable_m2_card
@@ -209,7 +209,8 @@ fi
 
 # Check Synology has a PCIe x8 slot
 if which dmidecode >/dev/null; then
-    if ! dmidecode -t slot | grep "PCI Express x8" >/dev/null ; then
+    #if ! dmidecode -t slot | grep "PCI Express x8" >/dev/null ; then
+    if ! dmidecode -t slot | grep "x8 PCI Express" >/dev/null ; then
         echo "${model}: No PCIe x8 slot found!"
         exit 1
     fi
@@ -311,7 +312,7 @@ cleanup_tmp(){
     fi
 
     # Add warning to DSM log
-    if [[ -z $cleanup_err ]]; then
+    if [[ $cleanup_err ]]; then
         syslog_set warn "$script update failed to delete tmp files"
     fi
 }