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

Push SMB mount code to 1.5

Browse Source
This commit is contained in:
Alexandre
2021-10-23 12:13:13 +02:00
parent 979fb38866
commit bf4190f1ae
33 changed files with 752 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
prowlarr/CHANGELOG.md
View File

@@ -1,172 +1,229 @@
- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
## nightly-0.1.1.1029-ls161 (19-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.1006-ls157 (12-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.1005-ls156 (11-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.990-ls152 (09-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.981-ls151 (08-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.976-ls149 (06-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.966-ls148 (03-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.965-ls147 (02-10-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.953-ls146 (26-09-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.950-ls144 (24-09-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.946-ls143 (21-09-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.940-ls142 (16-09-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.927-ls141 (08-09-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.919-ls140 (03-09-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.913-ls139 (02-09-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.893-ls135 (31-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.885-ls134 (28-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.875-ls132 (26-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.1.868-ls130 (24-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.834-ls124 (21-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.826-ls121 (19-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.816-ls118 (17-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.783-ls107 (14-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.771-ls104 (11-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## develop-0.1.0.768-ls12 (08-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.767-ls102 (07-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.765-ls101 (07-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.749-ls96 (03-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.738-ls95 (02-08-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.725-ls90 (31-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.722-ls89 (30-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.718-ls88 (29-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.717-ls87 (29-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.712-ls84 (26-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.710-ls83 (25-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.702-ls81 (22-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.701-ls80 (21-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.688-ls79 (18-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.686-ls78 (16-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.679-ls76 (16-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.640-ls72 (14-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.624-ls70 (13-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.611-ls68 (11-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.608-ls67 (10-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.605-ls66 (09-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.599-ls65 (07-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.595-ls64 (05-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.575-ls60 (01-07-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.571-ls59 (30-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.568-ls58 (30-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.563-ls56 (29-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.554-ls53 (28-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.547-ls51 (27-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.530-ls46 (25-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.526-ls45 (24-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.521-ls43 (24-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-0.1.0.515-ls41 (22-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
- Update to latest version from linuxserver/docker-prowlarr

39
prowlarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
View File

@@ -1,8 +1,8 @@
#!/usr/bin/with-contenv bashio
####################
# MOUNT SMB SHARES #
####################
#########################
# MOUNT SMB SHARES v1.5 #
#########################
if bashio::config.has_value 'networkdisks'; then
# Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
# if Fail test different smb and sec versions
if [ $MOUNTED = false ]; then
for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
done
fi
# Test smbclient if not mounted yet
if [ $MOUNTED = false ]; then
smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
bashio::log.info "Mounted with smbclient"
fi
# Messages
if [ $MOUNTED = true ]; then
if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
#Test write permissions
touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
&& bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
|| bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
else
# message if still fail
bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
bashio::log.fatal "Error read : $(<ERRORCODE)" # Mount share
# Mounting failed messages
bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
bashio::log.fatal "Here is some debugging info :"
# Provide debugging info
smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
# Error code
bashio::log.fatal "Error read : $(<ERRORCODE)"
rm ERRORCODE
# clean folder
umount /mnt/$diskname 2>/dev/null || true
rmdir /mnt/$diskname || true
fi
done