avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-02-03 10:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor CIFS mounting logic and improve disk parsing

Browse Source 
Removed redundant retry function for CIFS mounting and improved error handling by simplifying options. Enhanced disk list parsing to handle commas and trailing characters more robustly.
This commit is contained in:
Alexandre
2026-02-02 21:58:52 +01:00
committed by GitHub
parent 92842a0830
commit 59bcf140bc
1 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
.templates/00-smb_mounts.sh
View File

@@ -93,45 +93,6 @@ retry_cifs_with_vers_ladder_on_einval() {
local err
err="$(cat "$ERRORCODE_FILE" 2>/dev/null || true)"
# Only step down dialects on EINVAL
if ! echo "$err" | grep -q "mount error(22)"; then
return 0
fi
bashio::log.warning "...... EINVAL (22): trying SMB dialect ladder (3.x -> 2.x)."
local base_opts try_opts vers
# Start from current options but remove any existing vers=/sec= (avoid stacking)
base_opts="$MOUNTOPTIONS"
base_opts="$(echo "$base_opts" | sed -E 's/,vers=[^,]+//g; s/,sec=[^,]+//g')"
for vers in "3.1.1" "3.02" "3.0" "2.1" "2.0"; do
if [[ "$MOUNTED" == "false" ]]; then
try_opts="${base_opts},vers=${vers}"
mount_drive "$try_opts"
fi
done
# If still failing with EINVAL, simplify options that sometimes trip older servers/clients
if [[ "$MOUNTED" == "false" ]]; then
bashio::log.warning "...... still failing after vers ladder; retrying with reduced CIFS options."
base_opts="$MOUNTOPTIONS"
base_opts="$(echo "$base_opts" | sed -E 's/,vers=[^,]+//g; s/,sec=[^,]+//g')"
base_opts="${base_opts//,mfsymlinks/}"
base_opts="${base_opts//,nobrl/}"
base_opts="$(echo "$base_opts" | sed - differing='')"
fi
}
# Fix: previous line accidentally inserted? Remove.
retry_cifs_with_vers_ladder_on_einval() {
[[ "${FSTYPE:-}" == "cifs" ]] || return 0
[[ "${MOUNTED:-false}" == "false" ]] || return 0
local err
err="$(cat "$ERRORCODE_FILE" 2>/dev/null || true)"
if ! echo "$err" | grep -q "mount error(22)"; then
return 0
fi
@@ -216,10 +177,18 @@ if bashio::config.has_value 'networkdisks'; then
PGID=",gid=$(bashio::config 'PGID')"
fi
for disk in ${MOREDISKS//,/ }; do
# ----------------------------
# FIX: robust comma-splitting
# ----------------------------
IFS=',' read -r -a DISK_LIST <<< "$MOREDISKS"
for disk in "${DISK_LIST[@]}"; do
CRED_FILE=""
cleanup_cred
# FIX: tolerate CRLF / trailing \r
disk="${disk//$'\r'/}"
disk="$(echo "$disk" | sed 's,/$,,')"
disk="${disk//"\040"/ }"