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

Fix 4 critical issues in SMB/NFS mount script

Browse Source 
1. Mountpoint name collisions: check if /mnt/$diskname already exists
   before mounting and skip with warning if it does
2. test_mount() readonly false positive: verify mountpoint is actually
   mounted before reporting readonly status
3. Independent retries: save original MOUNTOPTIONS and use as base for
   each noserverino/noperm retry independently
4. Hostname support: accept hostnames (not just IPv4) in CIFS/NFS path
   validation, FSTYPE detection, and server extraction

Co-authored-by: alexbelgium <44178713+alexbelgium@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-02-22 16:52:23 +00:00
parent 9dfafc0406
commit c591203a70
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
.templates/00-smb_mounts.sh
View File

@@ -47,9 +47,11 @@ test_mount() {
return 0
fi
if [[ "$FSTYPE" == "cifs" && "$MOUNTOPTIONS" != *"noserverino"* ]]; then
local orig_mountoptions="$MOUNTOPTIONS"
if [[ "$FSTYPE" == "cifs" && "$orig_mountoptions" != *"noserverino"* ]]; then
echo "... retrying mount with noserverino"
MOUNTOPTIONS="${MOUNTOPTIONS},noserverino"
MOUNTOPTIONS="${orig_mountoptions},noserverino"
umount "$mountpoint" 2>/dev/null || true
if mount_drive "$MOUNTOPTIONS"; then
@@ -60,9 +62,9 @@ test_mount() {
fi
fi
if [[ "$FSTYPE" == "cifs" && "$MOUNTOPTIONS" != *"noperm"* ]]; then
if [[ "$FSTYPE" == "cifs" && "$orig_mountoptions" != *"noperm"* ]]; then
echo "... retrying mount with noperm"
MOUNTOPTIONS="${MOUNTOPTIONS},noperm"
MOUNTOPTIONS="${orig_mountoptions},noperm"
umount "$mountpoint" 2>/dev/null || true
if mount_drive "$MOUNTOPTIONS"; then
@@ -73,7 +75,11 @@ test_mount() {
fi
fi
MOUNTED="readonly"
if mountpoint -q "$mountpoint"; then
MOUNTED="readonly"
else
MOUNTED=false
fi
return 0
}
@@ -226,12 +232,12 @@ if bashio::config.has_value 'networkdisks'; then
if [[ "$disk" =~ ^nfs:// ]]; then
FSTYPE="nfs"
disk="${disk#nfs://}"
elif [[ "$disk" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:/.+ ]]; then
elif [[ "$disk" =~ ^[^/][^:]*:/.+ ]]; then
FSTYPE="nfs"
fi
if [[ "$FSTYPE" == "cifs" ]]; then
server="$(echo "$disk" | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | head -n 1)"
server="$(echo "$disk" | sed -E 's|^//([^/]+)/.*|\1|')"
else
server="${disk%%:*}"
fi
@@ -240,6 +246,11 @@ if bashio::config.has_value 'networkdisks'; then
diskname="${diskname//\\//}"
diskname="${diskname##*/}"
if [[ -d "/mnt/$diskname" ]]; then
bashio::log.warning "...... mount point /mnt/$diskname already exists (name collision for $disk). Skipping this share."
continue
fi
ERRORCODE_FILE="/tmp/mount_error_${diskname//[^a-zA-Z0-9._-]/_}.log"
: >"$ERRORCODE_FILE" || true
@@ -253,14 +264,14 @@ if bashio::config.has_value 'networkdisks'; then
echo "... mounting ($FSTYPE) $disk"
if [[ "$FSTYPE" == "cifs" ]]; then
if [[ ! "$disk" =~ ^//[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/.+ ]]; then
bashio::log.fatal "...... invalid CIFS path \"$disk\". Use //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2"
if [[ ! "$disk" =~ ^//[^/]+/.+ ]]; then
bashio::log.fatal "...... invalid CIFS path \"$disk\". Use //server/sharedfolder or //123.12.12.12/sharedfolder"
echo "Invalid CIFS path structure: $disk" >"$ERRORCODE_FILE" || true
continue
fi
else
if [[ ! "$disk" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:/.+ ]]; then
bashio::log.fatal "...... invalid NFS path \"$disk\". Use 123.12.12.12:/export/path"
if [[ ! "$disk" =~ ^[^:]+:/.+ ]]; then
bashio::log.fatal "...... invalid NFS path \"$disk\". Use server:/export/path or 123.12.12.12:/export/path"
echo "Invalid NFS path structure: $disk" >"$ERRORCODE_FILE" || true
continue
fi