Merge pull request #137 from 007revad/develop

Develop
007revad · Aug 22, 2023 · b6ea55f · b6ea55f
2 parents 8fc33ca + c29ed41
commit b6ea55f
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 27 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,6 @@
+v3.1.63
+- Added support to disable unsupported memory warnings on DVA models.
+
 v3.1.62
 - Fixed bug where newly connected expansion units weren't found until up to 24 hours later. #124
 

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ See <a href=images/how_to_download.png/>How to download the script</a> for the e
 
 ### When to run the script
 
-You would need to re-run the script after a DSM update. If you have DSM set to auto update the best option is to run the script every time the Synology boots, and the best way to do that is to setup a scheduled task to run the the script at boot-up.
+You would need to re-run the script after a DSM update. If you have DSM set to auto update the best option is to run the script every time the Synology boots, and the best way to do that is to <a href=how_to_schedule.md/>setup a scheduled task</a> to run the the script at boot-up.
 
 **Note:** After you first run the script you may need to reboot the Synology to see the effect of the changes.
 
@@ -101,6 +101,28 @@ sudo -i /path-to-script/syno_hdd_db.sh -nr --showedits
 
 **Donators**
 
-- Thank you to Gummibando on reddit for their donation.
-- Thank you to the onimous donors.
-
+Thank you to the following paypal donators and GitHub sponsors
+
+- Bogdan-Stefan Rotariu
+- Kevin Boatswain
+- anschluss-org
+- Kyle Reid
+- Yemeth
+- Nick Dawson
+- Patrick Thomas
+- Manuel Marquez Corral
+- Evrard Franck
+- Chad Palmer
+- 侯永政
+- CHENHAN-YING
+- Eric Wells
+- Massimiliano Pesce
+- JasonEMartin
+- Kevin Boatswain
+- Gerrit Klussmann
+- Alain Aube
+- Robert Kraut
+- Charles-Edouard Poisnel
+- Oliver Busch
+- Gummibando
+- The onimous donors
diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
@@ -29,6 +29,8 @@
 # Change how synoinfo.conf is backed up and restored to prevent issue #73
 
 # DONE
+# Added support to disable unsupported memory warnings on DVA models.
+#
 # Fixed bug where newly connected expansion units weren't found until up to 24 hours later. #124
 #
 # Added enabling E10M20-T1, M2D20 and M2D18 for DS1821+, DS1621+ and DS1520+.
@@ -202,7 +204,7 @@
 # Optionally disable "support_disk_compatibility".
 
 
-scriptver="v3.1.62"
+scriptver="v3.1.63"
 script=Synology_HDD_db
 repo="007revad/Synology_HDD_db"
 
@@ -641,6 +643,14 @@ if [[ $restore == "yes" ]]; then
         # Update .db files from Synology
         syno_disk_db_update --update
 
+        # Enable SynoMemCheck.service for DVA models
+        if [[ ${model:0:3} == "dva" ]]; then
+            memcheck="/usr/lib/systemd/system/SynoMemCheck.service"
+            if [[ $(synogetkeyvalue "$memcheck" ExecStart) == "/bin/true" ]]; then
+                synosetkeyvalue "$memcheck" ExecStart /usr/syno/bin/syno_mem_check
+            fi
+        fi
+
         if [[ -z $restoreerr ]]; then
             echo -e "\nRestore successful."
         fi
@@ -1004,6 +1014,7 @@ editcount(){
     fi
 }
 
+
 editdb7(){
     if [[ $1 == "append" ]]; then  # model not in db file
         #if sed -i "s/}}}/}},\"$hdmodel\":{$fwstrng$default/" "$2"; then  # append
@@ -1255,6 +1266,7 @@ check_modeldtb(){
     fi
 }
 
+
 for c in "${m2cards[@]}"; do
     #echo ""
     m2cardconf="/usr/syno/etc.defaults/adapter_cards.conf"
@@ -1330,30 +1342,40 @@ else
 fi
 
 
-# Optionally disable "support_memory_compatibility"
-smc=support_memory_compatibility
-setting="$(get_key_value $synoinfo $smc)"
-if [[ $ram == "yes" ]]; then
-    if [[ $setting == "yes" ]]; then
-        # Disable support_memory_compatibility
-        synosetkeyvalue "$synoinfo" "$smc" "no"
-        setting="$(get_key_value "$synoinfo" $smc)"
+# Optionally disable "support_memory_compatibility" (not for DVA models)
+if [[ ${model:0:3} != "dva" ]]; then
+    smc=support_memory_compatibility
+    setting="$(get_key_value $synoinfo $smc)"
+    if [[ $ram == "yes" ]]; then
+        if [[ $setting == "yes" ]]; then
+            # Disable support_memory_compatibility
+            synosetkeyvalue "$synoinfo" "$smc" "no"
+            setting="$(get_key_value "$synoinfo" $smc)"
+            if [[ $setting == "no" ]]; then
+                echo -e "\nDisabled support memory compatibility."
+            fi
+        elif [[ $setting == "no" ]]; then
+            echo -e "\nSupport memory compatibility already disabled."
+        fi
+    else
         if [[ $setting == "no" ]]; then
-            echo -e "\nDisabled support memory compatibility."
+            # Enable support_memory_compatibility
+            synosetkeyvalue "$synoinfo" "$smc" "yes"
+            setting="$(get_key_value "$synoinfo" $smc)"
+            if [[ $setting == "yes" ]]; then
+                echo -e "\nRe-enabled support memory compatibility."
+            fi
+        elif [[ $setting == "yes" ]]; then
+            echo -e "\nSupport memory compatibility already enabled."
         fi
-    elif [[ $setting == "no" ]]; then
-        echo -e "\nSupport memory compatibility already disabled."
     fi
-else
-    if [[ $setting == "no" ]]; then
-        # Enable support_memory_compatibility
-        synosetkeyvalue "$synoinfo" "$smc" "yes"
-        setting="$(get_key_value "$synoinfo" $smc)"
-        if [[ $setting == "yes" ]]; then
-            echo -e "\nRe-enabled support memory compatibility."
-        fi
-    elif [[ $setting == "yes" ]]; then
-        echo -e "\nSupport memory compatibility already enabled."
+fi
+
+# Optionally disable SynoMemCheck.service for DVA models
+if [[ ${model:0:3} == "dva" ]]; then
+    memcheck="/usr/lib/systemd/system/SynoMemCheck.service"
+    if [[ $(synogetkeyvalue "$memcheck" ExecStart) == "/usr/syno/bin/syno_mem_check" ]]; then
+        synosetkeyvalue "$memcheck" ExecStart /bin/true
     fi
 fi
 
@@ -1373,7 +1395,7 @@ if [[ $dsm -gt "6" ]]; then  # DSM 6 as has no /proc/meminfo
                     bytes=$(printf %s "${array[num]}" | awk '{print $3}')             # GitHub issue #86, 87
                     if [[ $ramsize =~ ^[0-9]+$ ]]; then  # Check $ramsize is numeric  # GitHub issue #86, 87
                         if [[ $bytes == "GB" ]]; then    # DSM 7.2 dmidecode returned GB
-                            ramsize=$((ramsize * 1024))  # Convert to MB  # GitHub issue #107
+                            ramsize=$((ramsize * 1024))  # Convert to MB              # GitHub issue #107
                         fi
                         if [[ $ramtotal ]]; then
                             ramtotal=$((ramtotal +ramsize))