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

Update 00-smb_mounts.sh

Browse Source
This commit is contained in:
Alexandre
2026-02-05 21:16:19 +01:00
committed by GitHub
parent 9fcabc2011
commit 10eb50d5b5
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.templates/00-smb_mounts.sh
View File

@@ -36,7 +36,7 @@ test_mount() {
_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" || true
return 0 return 0
else else
return 1 return 1
@@ -49,14 +49,27 @@ test_mount() {
return 0 return 0
fi fi
# ---- CIFS fallback check ---- # ---- CIFS fallback: retry with noserverino ----
if [[ "$FSTYPE" == "cifs" && "$MOUNTOPTIONS" != *"noserverino"* ]]; then if [[ "$FSTYPE" == "cifs" && "$MOUNTOPTIONS" != *"noserverino"* ]]; then
echo "... retrying mount with noserverino" echo "... retrying mount with noserverino"
MOUNTOPTIONS="${MOUNTOPTIONS},noserverino" MOUNTOPTIONS="${MOUNTOPTIONS},noserverino"
umount "$mountpoint" 2>/dev/null || true umount "$mountpoint" 2>/dev/null || true
if mount_drive "$MOUNTOPTIONS"; then if mount_drive "$MOUNTOPTIONS"; then
# retest with new options if _test_write; then
MOUNTED=true
return 0
fi
fi
fi
# ---- CIFS fallback: retry with noperm (common Samba permission quirk) ----
if [[ "$FSTYPE" == "cifs" && "$MOUNTOPTIONS" != *"noperm"* ]]; then
echo "... retrying mount with noperm"
MOUNTOPTIONS="${MOUNTOPTIONS},noperm"
umount "$mountpoint" 2>/dev/null || true
if mount_drive "$MOUNTOPTIONS"; then
if _test_write; then if _test_write; then
MOUNTED=true MOUNTED=true
return 0 return 0
@@ -65,10 +78,9 @@ test_mount() {
fi fi
# ---- Final: mounted but not writable ---- # ---- Final: mounted but not writable ----
bashio::log.warning "Disk mounted but is read-only or not writable (permission denied). Continuing anyway." bashio::log.warning "Disk mounted but is not writable (permission denied). Marking as read-only."
MOUNTED=true MOUNTED="readonly"
return 0 return 0
} }
mount_drive() { mount_drive() {
@@ -403,6 +415,13 @@ if bashio::config.has_value 'networkdisks'; then
fi fi
cleanup_cred cleanup_cred
elif [[ "$MOUNTED" == "readonly" ]]; then
bashio::log.warning "...... $disk mounted to /mnt/$diskname but is READ-ONLY or not writable by UID/GID ${PUID#,uid=}:${PGID#,gid=}."
bashio::log.warning "...... Check Samba share permissions, or try setting PUID/PGID to 0/0 (root), or adjust server ACLs."
rm -f "$ERRORCODE_FILE" 2>/dev/null || true
cleanup_cred
else else
if [[ "$FSTYPE" == "cifs" ]]; then if [[ "$FSTYPE" == "cifs" ]]; then
bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $USERNAME. Please check share path, username/password/domain; try UID/GID 0." bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $USERNAME. Please check share path, username/password/domain; try UID/GID 0."