Browse Source

Merge pull request #387 from wjz304/patch-1

Some disks will be blocked in special scenarios
pull/391/head
Dave Russell 1 year ago
committed by GitHub
parent
commit
27e3c91a91
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 21
      syno_hdd_db.sh

21
syno_hdd_db.sh

@ -897,7 +897,7 @@ fixdrivemodel(){
get_size_gb(){ get_size_gb(){
# $1 is /sys/block/sata1 or /sys/block/nvme0n1 etc # $1 is /sys/block/sata1 or /sys/block/nvme0n1 etc
local disk_size_gb local disk_size_gb
disk_size_gb=$(synodisk --info /dev/"$(basename -- "$1")" | grep 'Total capacity' | awk '{print int($4 * 1.073741824)}') disk_size_gb=$(synodisk --info /dev/"$(basename -- "$1")" 2>/dev/null | grep 'Total capacity' | awk '{print int($4 * 1.073741824)}')
echo "$disk_size_gb" echo "$disk_size_gb"
} }
@ -932,15 +932,16 @@ getdriveinfo(){
# Get drive GB size # Get drive GB size
size_gb=$(get_size_gb "$1") size_gb=$(get_size_gb "$1")
if [ -n "$size_gb" ]; then
if [[ $hdmodel ]] && [[ $fwrev ]]; then if [[ $hdmodel ]] && [[ $fwrev ]]; then
if /usr/syno/bin/synodisk --enum -t cache | grep -q /dev/"$(basename -- "$1")"; then if /usr/syno/bin/synodisk --enum -t cache | grep -q /dev/"$(basename -- "$1")"; then
# Is SATA M.2 SSD # Is SATA M.2 SSD
nvmelist+=("${hdmodel},${fwrev},${size_gb}") nvmelist+=("${hdmodel},${fwrev},${size_gb}")
else else
hdlist+=("${hdmodel},${fwrev},${size_gb}") hdlist+=("${hdmodel},${fwrev},${size_gb}")
fi fi
drivelist+=("${hdmodel}") drivelist+=("${hdmodel}")
fi
fi fi
fi fi
} }

Loading…
Cancel
Save