avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-01-24 21:46:29 +01: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

24
plex/CHANGELOG.md
View File

@@ -1,68 +1,90 @@
- 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
## 1.24.4.5081-e362dc1ee-ls79 (13-10-2021)
- Update to latest version from linuxserver/docker-plex
- Allow mounting of devices up to sdg2
## 1.24.3.5033-757abe6b4-ls75 (21-09-2021)
- Update to latest version from linuxserver/docker-plex
## 1.24.2.4973-2b1b51db9-ls73 (09-09-2021)
- Update to latest version from linuxserver/docker-plex
## 1.24.1.4931-1a38e63c6-ls70 (24-08-2021)
- Update to latest version from linuxserver/docker-plex
## 1.24.0.4930-ab6e1a058-ls68 (14-08-2021)
- Update to latest version from linuxserver/docker-plex
## 1.23.6.4881-e2e58f321-ls65 (30-07-2021)
- Update to latest version from linuxserver/docker-plex
## 1.23.5.4862-0f739d462-ls64 (24-07-2021)
- Update to latest version from linuxserver/docker-plex
## 1.23.5.4841-549599676-ls63 (21-07-2021)
- Update to latest version from linuxserver/docker-plex
## 1.23.4.4805-186bae04e-ls61 (13-07-2021)
- Update to latest version from linuxserver/docker-plex
## 1.23.3.4707-ebb5fe9f3-ls58 (22-06-2021)
- Update to latest version from linuxserver/docker-plex
## nightly-0.1.0.515-ls41 (22-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## 1.23.3.4707-ebb5fe9f3-ls58 (22-06-2021)
- Update to latest version from linuxserver/docker-plex
## nightly-0.1.0.515-ls41 (22-06-2021)
- Update to latest version from linuxserver/docker-prowlarr
## 1.23.3.4707-ebb5fe9f3-ls57 (22-06-2021)
- Update to latest version from linuxserver/docker-plex
## 1.23.2.4656-85f0adf5b-ls54 (06-06-2021)
- Update to latest version from linuxserver/docker-plex
## 1.23.2.4625-a83d2d0f9-ls52 (03-06-2021)
- Update to latest version from linuxserver/docker-plex
## 1.23.1.4602-280ab6053-ls51 (28-05-2021)
- Update to latest version from linuxserver/docker-plex
## 1.23.1.4571-6119e8eed-ls50 (26-05-2021)
- Update to latest version from linuxserver/docker-plex
## 1.22.3.4523-d0ce30438-ls48 (19-05-2021)
- Update to latest version from linuxserver/docker-plex
## 1.22.3.4523-d0ce30438-ls47 (14-05-2021)
- Update to latest version from linuxserver/docker-plex
## 1.22.3.4392-d7c624def-ls46 (12-05-2021)
- Update to latest version from linuxserver/docker-plex
## 1.22.3.4392-d7c624def-ls45 (05-05-2021)
- Update to latest version from linuxserver/docker-plex
- Update to latest version from linuxserver/docker-plex

39
plex/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