avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-11 01:55:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor SMB mount script for improved robustness

Browse Source
This commit is contained in:
Alexandre
2026-02-02 22:04:45 +01:00
committed by GitHub
parent 59bcf140bc
commit 3f10b4323b
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.templates/00-smb_mounts.sh
View File

@@ -35,7 +35,7 @@ test_mount() {
# ---- Write test function ---- # ---- Write test function ----
_test_write() { _test_write() {
local testfile="$mountpoint/.writetest_$$" local testfile="$mountpoint/.writetest_$$"
if : > "$testfile" 2>/dev/null; then if : >"$testfile" 2>/dev/null; then
rm -f "$testfile" rm -f "$testfile"
return 0 return 0
else else
@@ -54,7 +54,7 @@ test_mount() {
echo "... retrying mount with noserverino" echo "... retrying mount with noserverino"
MOUNTOPTIONS="${MOUNTOPTIONS},noserverino" MOUNTOPTIONS="${MOUNTOPTIONS},noserverino"
umount "$mountpoint" 2>/dev/null umount "$mountpoint" 2>/dev/null || true
if mount_drive "$MOUNTOPTIONS"; then if mount_drive "$MOUNTOPTIONS"; then
# retest with new options # retest with new options
if _test_write; then if _test_write; then
@@ -93,6 +93,7 @@ retry_cifs_with_vers_ladder_on_einval() {
local err local err
err="$(cat "$ERRORCODE_FILE" 2>/dev/null || true)" err="$(cat "$ERRORCODE_FILE" 2>/dev/null || true)"
# Only step down dialects on EINVAL
if ! echo "$err" | grep -q "mount error(22)"; then if ! echo "$err" | grep -q "mount error(22)"; then
return 0 return 0
fi fi
@@ -101,6 +102,7 @@ retry_cifs_with_vers_ladder_on_einval() {
local base_opts try_opts vers local base_opts try_opts vers
# Start from current options but remove any existing vers=/sec= (avoid stacking)
base_opts="$MOUNTOPTIONS" base_opts="$MOUNTOPTIONS"
base_opts="$(echo "$base_opts" | sed -E 's/,vers=[^,]+//g; s/,sec=[^,]+//g')" base_opts="$(echo "$base_opts" | sed -E 's/,vers=[^,]+//g; s/,sec=[^,]+//g')"
@@ -156,7 +158,15 @@ if bashio::config.has_value 'networkdisks'; then
SECVERS="" SECVERS=""
CHARSET=",iocharset=utf8" CHARSET=",iocharset=utf8"
# Clean data (keeps NFS entries intact) # ----------------------------
# Normalize / clean networkdisks
# ----------------------------
# Normalize Windows CRLF and multiline entries (HA UI/YAML can introduce these)
MOREDISKS="${MOREDISKS//$'\r'/}"
MOREDISKS="${MOREDISKS//$'\n'/,}"
# Clean data (keeps NFS entries intact): normalize "comma with spaces" to plain commas
MOREDISKS="$(echo "$MOREDISKS" | sed -E 's/[[:space:]]*,[[:space:]]*/,/g; s/^[[:space:]]+//; s/[[:space:]]+$//')" MOREDISKS="$(echo "$MOREDISKS" | sed -E 's/[[:space:]]*,[[:space:]]*/,/g; s/^[[:space:]]+//; s/[[:space:]]+$//')"
# CIFS domain/workgroup # CIFS domain/workgroup
@@ -177,17 +187,17 @@ if bashio::config.has_value 'networkdisks'; then
PGID=",gid=$(bashio::config 'PGID')" PGID=",gid=$(bashio::config 'PGID')"
fi fi
# ---------------------------- # Split strictly on commas (no word-splitting/globbing)
# FIX: robust comma-splitting
# ----------------------------
IFS=',' read -r -a DISK_LIST <<< "$MOREDISKS" IFS=',' read -r -a DISK_LIST <<< "$MOREDISKS"
for disk in "${DISK_LIST[@]}"; do for disk in "${DISK_LIST[@]}"; do
CRED_FILE="" CRED_FILE=""
cleanup_cred cleanup_cred
# FIX: tolerate CRLF / trailing \r # Per-item trim + safety cleanup
disk="${disk//$'\r'/}" disk="${disk//$'\r'/}"
disk="$(echo "$disk" | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//')"
[[ -z "$disk" ]] && continue
disk="$(echo "$disk" | sed 's,/$,,')" disk="$(echo "$disk" | sed 's,/$,,')"
disk="${disk//"\040"/ }" disk="${disk//"\040"/ }"