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

Merge pull request #2513 from alexbelgium/copilot/fix-mountpoint-name-collisions

Browse Source 
Fix 4 critical bugs in SMB/NFS mount script
This commit is contained in:
Alexandre
2026-02-22 17:58:49 +01:00
committed by GitHub
parent a91ff1f91f 89b4cdebef
commit a1f774cf10
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.templates/00-smb_mounts.sh
View File

@@ -47,9 +47,11 @@ test_mount() {
return 0 return 0
fi fi
if [[ "$FSTYPE" == "cifs" && "$MOUNTOPTIONS" != *"noserverino"* ]]; then local orig_mountoptions="$MOUNTOPTIONS"
if [[ "$FSTYPE" == "cifs" && "$orig_mountoptions" != *"noserverino"* ]]; then
echo "... retrying mount with noserverino" echo "... retrying mount with noserverino"
MOUNTOPTIONS="${MOUNTOPTIONS},noserverino" MOUNTOPTIONS="${orig_mountoptions},noserverino"
umount "$mountpoint" 2>/dev/null || true umount "$mountpoint" 2>/dev/null || true
if mount_drive "$MOUNTOPTIONS"; then if mount_drive "$MOUNTOPTIONS"; then
@@ -60,9 +62,9 @@ test_mount() {
fi fi
fi fi
if [[ "$FSTYPE" == "cifs" && "$MOUNTOPTIONS" != *"noperm"* ]]; then if [[ "$FSTYPE" == "cifs" && "$orig_mountoptions" != *"noperm"* ]]; then
echo "... retrying mount with noperm" echo "... retrying mount with noperm"
MOUNTOPTIONS="${MOUNTOPTIONS},noperm" MOUNTOPTIONS="${orig_mountoptions},noperm"
umount "$mountpoint" 2>/dev/null || true umount "$mountpoint" 2>/dev/null || true
if mount_drive "$MOUNTOPTIONS"; then if mount_drive "$MOUNTOPTIONS"; then
@@ -73,7 +75,11 @@ test_mount() {
fi fi
fi fi
MOUNTED="readonly" if mountpoint -q "$mountpoint"; then
MOUNTED="readonly"
else
MOUNTED=false
fi
return 0 return 0
} }
@@ -226,7 +232,7 @@ if bashio::config.has_value 'networkdisks'; then
if [[ "$disk" =~ ^nfs:// ]]; then if [[ "$disk" =~ ^nfs:// ]]; then
FSTYPE="nfs" FSTYPE="nfs"
disk="${disk#nfs://}" disk="${disk#nfs://}"
elif [[ "$disk" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:/.+ ]]; then elif [[ "$disk" =~ ^[^/:]+:/.+ ]]; then
FSTYPE="nfs" FSTYPE="nfs"
fi fi
@@ -240,6 +246,11 @@ if bashio::config.has_value 'networkdisks'; then
diskname="${diskname//\\//}" diskname="${diskname//\\//}"
diskname="${diskname##*/}" diskname="${diskname##*/}"
if mountpoint -q "/mnt/$diskname" 2>/dev/null; then
bashio::log.warning "...... mount point /mnt/$diskname already in use (name collision for $disk). Skipping this share."
continue
fi
ERRORCODE_FILE="/tmp/mount_error_${diskname//[^a-zA-Z0-9._-]/_}.log" ERRORCODE_FILE="/tmp/mount_error_${diskname//[^a-zA-Z0-9._-]/_}.log"
: >"$ERRORCODE_FILE" || true : >"$ERRORCODE_FILE" || true
@@ -259,8 +270,8 @@ if bashio::config.has_value 'networkdisks'; then
continue continue
fi fi
else else
if [[ ! "$disk" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:/.+ ]]; then if [[ ! "$disk" =~ ^[^/:]+:/.+ ]]; then
bashio::log.fatal "...... invalid NFS path \"$disk\". Use 123.12.12.12:/export/path" 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 echo "Invalid NFS path structure: $disk" >"$ERRORCODE_FILE" || true
continue continue
fi fi