From 051ba36f9b229b23621e71edbf23e536efc776b8 Mon Sep 17 00:00:00 2001 From: 007revad <39733752+007revad@users.noreply.github.com> Date: Tue, 31 Dec 2024 21:10:44 +1100 Subject: [PATCH 1/4] Update syno_hdd_db.sh --- syno_hdd_db.sh | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh index c6203f1..315cbbd 100644 --- a/syno_hdd_db.sh +++ b/syno_hdd_db.sh @@ -29,7 +29,7 @@ # /var/packages/StorageManager/target/ui/storage_panel.js -scriptver="v3.6.109" +scriptver="v3.6.110" script=Synology_HDD_db repo="007revad/Synology_HDD_db" scriptname=syno_hdd_db @@ -1196,22 +1196,27 @@ fi # Expansion units -# eSATA and InfiniBand ports both appear in syno_slot_mapping as: -# Esata port count: 1 -# Eunit port 1 - RX1214 -# Only device tree models have syno_slot_mapping -if which syno_slot_mapping >/dev/null; then - eunitlist=($(syno_slot_mapping | grep 'Eunit port' | awk '{print $5}')) -else - # Create new /var/log/diskprediction log to ensure newly connected ebox is in latest log - # Otherwise the new /var/log/diskprediction log is only created a midnight. - /usr/syno/bin/syno_disk_data_collector record - - # Get list of connected expansion units (aka eunit/ebox) - path="/var/log/diskprediction" - # shellcheck disable=SC2012 - file=$(ls $path | tail -n1) - eunitlist=($(grep -Eowi "([FRD]XD?[0-9]{3,4})(rp|ii|sas){0,2}" "$path/$file" | uniq)) +ebox_conected=$(synodisk --enum -t ebox) +if [[ $ebox_conected ]]; then + # Only device tree models have syno_slot_mapping + # eSATA and InfiniBand ports both appear in syno_slot_mapping as: + # Esata port count: 1 + # Eunit port 1 - RX1214 + if which syno_slot_mapping >/dev/null; then + # syno_slot_mapping does not find SAS eunits + eunitlist=($(syno_slot_mapping | grep 'Eunit port' | awk '{print $5}')) + fi + if [[ ${#eunitlist[@]} -eq "0" ]]; then + # Create new /var/log/diskprediction log to ensure newly connected ebox is in latest log + # Otherwise the new /var/log/diskprediction log is only created a midnight. + /usr/syno/bin/syno_disk_data_collector record + + # Get list of connected expansion units (aka eunit/ebox) + path="/var/log/diskprediction" + # shellcheck disable=SC2012 + file=$(ls $path | tail -n1) + eunitlist=($(grep -Eowi "([FRD]XD?[0-9]{3,4})(rp|ii|sas){0,2}" "$path/$file" | uniq)) + fi fi # Sort eunitlist array into new eunits array to remove duplicates @@ -2291,7 +2296,7 @@ if [[ $arch == "x86_64" ]]; then branch="main" file_url="https://raw.githubusercontent.com/${repo}/${branch}/bin/dhm_tool" # install_binfile - install_binfile dhm_tool "$file_url" /usr/syno/sbin/dhm_tool "a+x" bin/dhm_tool "$md5hash" + install_binfile dhm_tool "$file_url" /usr/syno/sbin/dhm_tool "755" bin/dhm_tool "$md5hash" # Check dhm_tool updated dhm_version="$(dhm_tool --version | grep "Utility Version" | awk '{print $NF}')" From 0341b07f2569b8beae50bd0e4c171935062ad9e9 Mon Sep 17 00:00:00 2001 From: AgardnerAU <50199760+AgardnerAU@users.noreply.github.com> Date: Sun, 26 Jan 2025 13:43:39 +0800 Subject: [PATCH 2/4] Update README.md De-duplicated flag explanation in readme. --- README.md | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/README.md b/README.md index 91554f4..6bc0a3f 100644 --- a/README.md +++ b/README.md @@ -81,35 +81,6 @@ ### Options when running the script There are optional flags you can use when running the script: ```YAML - -s, --showedits Show edits made to _host db and db.new file(s) - -n, --noupdate Prevent DSM updating the compatible drive databases - -r, --ram Disable memory compatibility checking (DSM 7.x only) - and sets max memory to the amount of installed memory - -f, --force Force DSM to not check drive compatibility - Do not use this option unless absolutely needed - -i, --incompatible Change incompatible drives to supported - Do not use this option unless absolutely needed - -w, --wdda Disable WD Device Analytics to prevent DSM showing - a false warning for WD drives that are 3 years old - DSM 7.2.1 already has WDDA disabled - -p, --pcie Enable creating volumes on M2 in unknown PCIe adaptor - -e, --email Disable colored text in output scheduler emails - -S, --ssd=DRIVE Enable write_mostly on slow internal drives so DSM - runs from the fast internal drive(s). - -S automatically sets internal SSDs as DSM preferred - --ssd=DRIVE requires the fast drive(s) as argument, - or restore as the argument to reset drives to default - --ssd=sata1 or --ssd=sata1,sata2 or --ssd=sda etc - --ssd=restore - --restore Undo all changes made by the script (except -S --ssd) - --autoupdate=AGE Auto update script (useful when script is scheduled) - AGE is how many days old a release must be before - auto-updating. AGE must be a number: 0 or greater - -I, --ihm Update IronWolf Health Monitor to 2.5.1 to support - recent model IronWolf and IronWolf Pro drives - -h, --help Show this help message - -v, --version Show the script version - -s, --showedits Show edits made to _host db and db.new file(s) -n, --noupdate Prevent DSM updating the compatible drive databases -r, --ram Disable memory compatibility checking (DSM 7.x only) From 7b1dd854c602fb2759d594a5234fdc484a1cd087 Mon Sep 17 00:00:00 2001 From: 007revad <39733752+007revad@users.noreply.github.com> Date: Sat, 15 Feb 2025 16:42:06 +1100 Subject: [PATCH 3/4] Update my-other-scripts.md --- my-other-scripts.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/my-other-scripts.md b/my-other-scripts.md index b465b69..91759fc 100644 --- a/my-other-scripts.md +++ b/my-other-scripts.md @@ -60,6 +60,9 @@ ### Synology recovery - **Synology_DSM_Telnet_Password** - Synology DSM Recovery Telnet Password of the Day generator. + +- **Syno_DSM_Extractor_GUI** + - Windows GUI for extracting Synology DSM 7 pat files and spk package files.               [Back to Contents](#contents) @@ -71,6 +74,9 @@ ### Other Synology scripts - **Video_Station_for_DSM_722** - Script to install Video Station in DSM 7.2.2 +- **SS_Motion_Detection** + - Installs previous Surveillance Station and Advanced Media Extensions versions so motion detection and HEVC are supported. + - **Synology_Config_Backup** - Backup and export your Synology DSM configuration. @@ -135,10 +141,13 @@ ### Synology dev - **Download_Synology_Archive** - Download all or part of the Synology archive. +- **Syno_DSM_Extractor_GUI** + - Windows GUI for extracting Synology DSM 7 pat files and spk package files. + - **ScriptNotify** - DSM 7 package to allow your scripts to send DSM notifications. - **DTC_GUI_for_Windows** - - GUI for DTC.exe for Window. + - GUI for DTC.exe for Windows.               [Back to Contents](#contents) From 3312b14be30d13c6549a1e7ef79169b699a1cad7 Mon Sep 17 00:00:00 2001 From: Dave Russell <39733752+007revad@users.noreply.github.com> Date: Fri, 21 Feb 2025 13:20:46 +1100 Subject: [PATCH 4/4] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d152d28..5ec1b67 100644 --- a/README.md +++ b/README.md @@ -200,7 +200,8 @@ ### Donators | | | | | |--------------------|--------------------|----------------------|----------------------| -| | | Toregev | M. Verhoef | +| | | | Fabio Petgola | +| lonestar6262 | Netchoice | Toregev | M. Verhoef | | Philipp Ehmeier | Adrian Playle | Daniel Meda | Richard Wilhelm | | Mika255 | Ralf Edelwein | Martin | Alexander Habisreitinger | | jrn | Marcus Wojtusik | Will (war59312) | Christopher Maglio |