From 486e4ef78225847b56674e79e1e375caa732e04f Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Fri, 19 Feb 2021 10:33:02 +0100
Subject: [PATCH] Update 50-mounts

---
 emby/root/etc/cont-init.d/50-mounts | 36 ++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/emby/root/etc/cont-init.d/50-mounts b/emby/root/etc/cont-init.d/50-mounts
index c6e3ba75b..dd6c29400 100644
--- a/emby/root/etc/cont-init.d/50-mounts
+++ b/emby/root/etc/cont-init.d/50-mounts
@@ -20,20 +20,34 @@ if bashio::config.has_value 'localdisks'; then
     bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
 fi
 
-# Mount CIFS Share if configured and if Protection Mode is active
+#########################
+# MOUNT SMB SHARES v1.0 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
+    # Mount CIFS Share if configured and if Protection Mode is active
+    bashio::log.info 'Mounting smb share(s)...'
+
+    # Define variables 
     MOREDISKS=$(bashio::config 'networkdisks')
     CIFS_USERNAME=$(bashio::config 'cifsusername')
     CIFS_PASSWORD=$(bashio::config 'cifspassword')
-    bashio::log.info "Network Disks mounting.. ${MOREDISKS}" && \
-    for disk in $MOREDISKS 
+
+    # 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
-        bashio::log.info "Mount ${disk}"
-        echo "Creating /storage/storagecifs"
-        mkdir -p /storage/storagecifs
-        chown -R abc:abc /storage/storagecifs
-        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /storage/storagecifs && \
-        bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount external drives!"
+      disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+      diskname=${disk##*/} # 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" 
+    done || true
 fi