From 60665acc3b4665d55a4d432073d092dae4ab8d04 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 24 Apr 2021 11:13:26 +0200
Subject: [PATCH] Update 92-smb_mounts_v1.1

---
 emby/root/etc/cont-init.d/92-smb_mounts_v1.1 | 58 ++++++++++++++++----
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/emby/root/etc/cont-init.d/92-smb_mounts_v1.1 b/emby/root/etc/cont-init.d/92-smb_mounts_v1.1
index 30c677477..3551a73b8 100644
--- a/emby/root/etc/cont-init.d/92-smb_mounts_v1.1
+++ b/emby/root/etc/cont-init.d/92-smb_mounts_v1.1
@@ -12,13 +12,6 @@ if bashio::config.has_value 'networkdisks'; then
     CIFS_USERNAME=$(bashio::config 'cifsusername')
     CIFS_PASSWORD=$(bashio::config 'cifspassword')
 
-    # Allow SMB1
-    if bashio::config.true 'smbv1'; then
-      SMBVERS=",vers=1.0"
-    else
-      SMBVERS=",vers=2.1"
-    fi
-
     # Mounting disks
     for disk in ${MOREDISKS//,/ }  # Separate comma separated values
     do
@@ -27,7 +20,52 @@ if bashio::config.has_value 'networkdisks'; then
       diskname=${diskname##*/} # Get only last part of the name
       mkdir -p /mnt/$diskname  # Create dir
       chown -R root:root /mnt/$diskname  # Permissions
-      mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD$SMBVERS $disk /mnt/$diskname && \
-      bashio::log.info "... $disk successfully mounted to /mnt/$diskname" || bashio::log.error "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD" # Mount share
-    done || true
+      mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /mnt/$diskname && \
+      bashio::log.info "... $disk successfully mounted to /mnt/$diskname"
+
+      # if Fail test smbv1
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,vers=1.0 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$diskname with smbv1"
+      fi
+
+      # Test smbv2.1
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,vers=2.1 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with smbv2.1"
+      fi
+
+      # Test smbv3
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,vers=3.0 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with smbv3"
+      fi
+
+      # Test ntlmv2
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,sec=ntlmv2 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with ntlmv2"
+      fi
+
+      # Test ntlmv2 and smbv3
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,sec=ntlmv2,vers=2.1 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with ntlmv2 and smbv2.1"
+      fi
+
+      # Test ntlmv2 and smbv3
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,sec=ntlmv2,vers=3 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with ntlmv2 and smbv3"
+      fi
+
+      if [ $? != 0 ]; then
+        # message if still fail
+        bashio::log.critical "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD . Please check your remote share path, the username and password, and try to check the smbv1 box in option if your share is using smb v1" # Mount share
+      else
+        # test write permissions
+        touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze || bashio::log.critical "Unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw" 
+      fi
+
+    done
 fi