AuxXxilium/arc-addons
1
0
Fork 0
mirror of https://github.com/AuxXxilium/arc-addons.git synced 2024-11-23 21:50:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

disks: fix

Browse Source 
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
AuxXxilium 2024-05-06 23:30:35 +02:00
parent 1bda567d2c
commit 224afdbee1
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
disks/install.sh
View File

@ -47,7 +47,7 @@ function _check_rootraidstatus() {
if [ ! "$(_get_conf_kv supportraid)" = "yes" ]; then if [ ! "$(_get_conf_kv supportraid)" = "yes" ]; then
return 0 return 0
fi fi
STATE=$(cat /sys/block/md0/md/array_state 2>/dev/null) STATE="$(cat /sys/block/md0/md/array_state 2>/dev/null)"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
return 1 return 1
fi fi
@ -66,7 +66,7 @@ function _atoi() {
while [ ${IDX} -lt ${#DISKNAME} ]; do while [ ${IDX} -lt ${#DISKNAME} ]; do
N=$(($(printf '%d' "'${DISKNAME:${IDX}:1}") - $(printf '%d' "'a") + 1)) N=$(($(printf '%d' "'${DISKNAME:${IDX}:1}") - $(printf '%d' "'a") + 1))
BIT=$((${#DISKNAME} - 1 - ${IDX})) BIT=$((${#DISKNAME} - 1 - ${IDX}))
[ ${BIT} -eq 0 ] && NUM=$((${NUM} + ${N})) || NUM=$((${NUM} + 26 ** ${BIT} * ${N})) [ ${BIT} -eq 0 ] && NUM=$((${NUM} + ${N:-0})) || NUM=$((${NUM} + 26 ** ${BIT} * ${N:-0}))
IDX=$((${IDX} + 1)) IDX=$((${IDX} + 1))
done done
echo $((${NUM} - 1)) echo $((${NUM} - 1))
@ -156,9 +156,7 @@ function getUsbPorts() {
function dtModel() { function dtModel() {
DEST="/addons/model.dts" DEST="/addons/model.dts"
UNIQUE=$(_get_conf_kv unique) UNIQUE=$(_get_conf_kv unique)
if [ ! -f "${DEST}" ]; then # Users can put their own dts. if [ ! -f "${DEST}" ]; then # Users can put their own dts.
# Build dts file
echo "/dts-v1/;" >${DEST} echo "/dts-v1/;" >${DEST}
echo "/ {" >>${DEST} echo "/ {" >>${DEST}
echo " compatible = \"Synology\";" >>${DEST} echo " compatible = \"Synology\";" >>${DEST}
@ -178,11 +176,9 @@ function dtModel() {
_set_conf_kv rd "supportnvme" "yes" _set_conf_kv rd "supportnvme" "yes"
_set_conf_kv rd "support_m2_pool" "yes" _set_conf_kv rd "support_m2_pool" "yes"
fi fi
# SATA ports # SATA ports
if [ "${1}" = "true" ]; then if [ "${1}" = "true" ]; then
I=1 I=1
# 106 = SATA
for P in $(lspci -d ::106 2>/dev/null | cut -d' ' -f1); do for P in $(lspci -d ::106 2>/dev/null | cut -d' ' -f1); do
HOSTNUM=$(ls -l /sys/class/scsi_host 2>/dev/null | grep ${P} | wc -l) HOSTNUM=$(ls -l /sys/class/scsi_host 2>/dev/null | grep ${P} | wc -l)
PCIPATH="" PCIPATH=""
@ -213,7 +209,6 @@ function dtModel() {
I=$((${I} + 1)) I=$((${I} + 1))
done done
done done
# 100 = SCSI, 104 = RAID, 107 = HBA
for P in $(lspci -d ::107 2>/dev/null | cut -d' ' -f1) $(lspci -d ::104 2>/dev/null | cut -d' ' -f1) $(lspci -d ::100 2>/dev/null | cut -d' ' -f1); do for P in $(lspci -d ::107 2>/dev/null | cut -d' ' -f1) $(lspci -d ::104 2>/dev/null | cut -d' ' -f1) $(lspci -d ::100 2>/dev/null | cut -d' ' -f1); do
J=1 J=1
while true; do while true; do
@ -282,7 +277,6 @@ function dtModel() {
COUNT=$((${COUNT} + 1)) COUNT=$((${COUNT} + 1))
fi fi
done done
# NVME Count # NVME Count
NVMEDISKS=$((${COUNT} - 1)) NVMEDISKS=$((${COUNT} - 1))
@ -300,11 +294,9 @@ function dtModel() {
COUNT=$((${COUNT} + 1)) COUNT=$((${COUNT} + 1))
done done
echo "};" >>${DEST} echo "};" >>${DEST}
# USB Count
USBDISKS=$((${COUNT} - 1))
fi fi
# USB Count
USBDISKS=$((${COUNT} - 1))
# Check for custom MAXDISKS # Check for custom MAXDISKS
if _check_post_k "rd" "maxdisks"; then if _check_post_k "rd" "maxdisks"; then
MAXDISKS=$(($(_get_conf_kv maxdisks))) MAXDISKS=$(($(_get_conf_kv maxdisks)))
@ -340,17 +332,26 @@ function nondtModel() {
USBPORTCFG=0 USBPORTCFG=0
ESATAPORTCFG=0 ESATAPORTCFG=0
INTERNALPORTCFG=0 INTERNALPORTCFG=0
HBA_NUMBER=$(($(lspci -d ::107 2>/dev/null | wc -l) + $(lspci -d ::104 2>/dev/null | wc -l) + $(lspci -d ::100 2>/dev/null | wc -l)))
hasUSB=false
USBMINIDX=20
USBMAXIDX=20
for I in $(ls -d /sys/block/sd* 2>/dev/null); do for I in $(ls -d /sys/block/sd* 2>/dev/null); do
IDX=$(_atoi ${I/\/sys\/block\/sd/}) IDX=$(_atoi ${I/\/sys\/block\/sd/})
[ $((${IDX} + 1)) -ge ${MAXDISKS} ] && MAXDISKS=$((${IDX} + 1))
ISUSB="$(cat ${I}/uevent 2>/dev/null | grep PHYSDEVPATH | grep usb)" ISUSB="$(cat ${I}/uevent 2>/dev/null | grep PHYSDEVPATH | grep usb)"
[ -n "${ISUSB}" ] && USBPORTCFG=$((${USBPORTCFG} | $((1 << ${IDX})))) if [ -n "${ISUSB}" ] && [ "${2}" = "true" ]; then
if [ -z "${ISUSB}" ] || [ "${2}" = "true" ]; then ([ ${IDX} -lt ${USBMINIDX} ] || [ "${hasUSB}" = "false" ]) && USBMINIDX=${IDX}
MAXDISKS=$((${IDX} + 1)) ([ ${IDX} -gt ${USBMAXIDX} ] || [ "${hasUSB}" = "false" ]) && USBMAXIDX=${IDX}
hasUSB=true
fi fi
done done
USBDISKNUM=$((${USBMAXIDX} - ${USBMINIDX}))
[ ${USBDISKNUM} -lt 6 ] && USBDISKNUM=6 # Define 6 is the minimum number of USB disks
[ $((${USBMINIDX} + ${USBDISKNUM})) -gt ${MAXDISKS} ] && MAXDISKS=$((${USBMINIDX} + ${USBDISKNUM}))
USBPORTCFG=$(($((2 ** ${MAXDISKS} - 1)) ^ $((2 ** ${USBMINIDX} - 1))))
# Check for custom MAXDISKS # Check for custom MAXDISKS
if _check_post_k "rd" "maxdisks"; then if _check_post_k "rd" "maxdisks"; then
MAXDISKS=$(($(_get_conf_kv maxdisks))) MAXDISKS=$(($(_get_conf_kv maxdisks)))
@ -359,17 +360,17 @@ function nondtModel() {
# Check for custom USBPORTCFG # Check for custom USBPORTCFG
if _check_post_k "rd" "usbportcfg"; then if _check_post_k "rd" "usbportcfg"; then
USBPORTCFG=$(($(_get_conf_kv usbportcfg))) USBPORTCFG=$(($(_get_conf_kv usbportcfg)))
echo "get usbportcfg=${USBPORTCFG}" printf 'get usbportcfg=0x%.2x\n' "${USBPORTCFG}"
fi fi
# Check for custom ESATAPORTCFG # Check for custom ESATAPORTCFG
if _check_post_k "rd" "esataportcfg"; then if _check_post_k "rd" "esataportcfg"; then
ESATAPORTCFG=$(($(_get_conf_kv esataportcfg))) ESATAPORTCFG=$(($(_get_conf_kv esataportcfg)))
echo "get esataportcfg=${ESATAPORTCFG}" printf 'get esataportcfg=0x%.2x\n' "${ESATAPORTCFG}"
fi fi
# Check for custom INTERNALPORTCFG # Check for custom INTERNALPORTCFG
if _check_post_k "rd" "internalportcfg"; then if _check_post_k "rd" "internalportcfg"; then
INTERNALPORTCFG=$(($(_get_conf_kv internalportcfg))) INTERNALPORTCFG=$(($(_get_conf_kv internalportcfg)))
echo "get internalportcfg=${INTERNALPORTCFG}" printf 'get internalportcfg=0x%.2x\n' "${INTERNALPORTCFG}"
else else
if [ "${2}" = "true" ]; then if [ "${2}" = "true" ]; then
INTERNALPORTCFG=$(($((2 ** ${MAXDISKS} - 1)) ^ ${USBPORTCFG} ^ ${ESATAPORTCFG})) INTERNALPORTCFG=$(($((2 ** ${MAXDISKS} - 1)) ^ ${USBPORTCFG} ^ ${ESATAPORTCFG}))
@ -379,13 +380,13 @@ function nondtModel() {
fi fi
# Set Maxdisks and Portconfig # Set Maxdisks and Portconfig
_set_conf_kv rd "maxdisks" "${MAXDISKS}" _set_conf_kv rd "maxdisks" "${MAXDISKS}"
echo "set maxdisks=${MAXDISKS}" printf "set maxdisks=%d\n" "${MAXDISKS}"
_set_conf_kv rd "usbportcfg" "$(printf '0x%.2x' ${USBPORTCFG})" _set_conf_kv rd "usbportcfg" "$(printf '0x%.2x' ${USBPORTCFG})"
echo "set usbportcfg=${USBPORTCFG}" printf 'set usbportcfg=0x%.2x\n' "${USBPORTCFG}"
_set_conf_kv rd "esataportcfg" "$(printf "0x%.2x" ${ESATAPORTCFG})" _set_conf_kv rd "esataportcfg" "$(printf "0x%.2x" ${ESATAPORTCFG})"
echo "set esataportcfg=${ESATAPORTCFG}" printf 'set esataportcfg=0x%.2x\n' "${ESATAPORTCFG}"
_set_conf_kv rd "internalportcfg" "$(printf "0x%.2x" ${INTERNALPORTCFG})" _set_conf_kv rd "internalportcfg" "$(printf "0x%.2x" ${INTERNALPORTCFG})"
echo "set internalportcfg=${INTERNALPORTCFG}" printf 'set internalportcfg=0x%.2x\n' "${INTERNALPORTCFG}"
fi fi
if [ "${1}" = "true" ]; then if [ "${1}" = "true" ]; then
@ -421,11 +422,11 @@ function nondtModel() {
if [ "${1}" = "patches" ]; then if [ "${1}" = "patches" ]; then
echo "Installing addon disks - ${1}" echo "Installing addon disks - ${1}"
BOOTDISK_PART3_PATH=$(blkid -L ARC3 2>/dev/null) BOOTDISK_PART3_PATH="$(blkid -L ARC3 2>/dev/null)"
[ -n "${BOOTDISK_PART3_PATH}" ] && BOOTDISK_PART3_MAJORMINOR="$((0x$(stat -c '%t' "${BOOTDISK_PART3_PATH}"))):$((0x$(stat -c '%T' "${BOOTDISK_PART3_PATH}")))" || BOOTDISK_PART3_MAJORMINOR="" [ -n "${BOOTDISK_PART3_PATH}" ] && BOOTDISK_PART3_MAJORMINOR="$((0x$(stat -c '%t' "${BOOTDISK_PART3_PATH}"))):$((0x$(stat -c '%T' "${BOOTDISK_PART3_PATH}")))" || BOOTDISK_PART3_MAJORMINOR=""
[ -n "${BOOTDISK_PART3_MAJORMINOR}" ] && BOOTDISK_PART3="$(cat /sys/dev/block/${BOOTDISK_PART3_MAJORMINOR}/uevent 2>/dev/null | grep 'DEVNAME' | cut -d'=' -f2)" || BOOTDISK_PART3="" [ -n "${BOOTDISK_PART3_MAJORMINOR}" ] && BOOTDISK_PART3="$(cat /sys/dev/block/${BOOTDISK_PART3_MAJORMINOR}/uevent 2>/dev/null | grep 'DEVNAME' | cut -d'=' -f2)" || BOOTDISK_PART3=""
[ -n "${BOOTDISK_PART3}" ] && BOOTDISK=$(ls -d /sys/block/*/${BOOTDISK_PART3} 2>/dev/null | cut -d'/' -f4) || BOOTDISK="" [ -n "${BOOTDISK_PART3}" ] && BOOTDISK="$(ls -d /sys/block/*/${BOOTDISK_PART3} 2>/dev/null | cut -d'/' -f4)" || BOOTDISK=""
[ -n "${BOOTDISK}" ] && BOOTDISK_PHYSDEVPATH="$(cat /sys/block/${BOOTDISK}/uevent 2>/dev/null | grep 'PHYSDEVPATH' | cut -d'=' -f2)" || BOOTDISK_PHYSDEVPATH="" [ -n "${BOOTDISK}" ] && BOOTDISK_PHYSDEVPATH="$(cat /sys/block/${BOOTDISK}/uevent 2>/dev/null | grep 'PHYSDEVPATH' | cut -d'=' -f2)" || BOOTDISK_PHYSDEVPATH=""
echo "BOOTDISK=${BOOTDISK}" echo "BOOTDISK=${BOOTDISK}"