From dd159cc5cb551a982e314fee4137181dd15c9ab7 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:56:50 +0200 Subject: [PATCH] Test Milenco code --- .../etc/cont-init.d/92-smb_mounts_v1.3.sh | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.3.sh b/qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.3.sh index 53039f651..f5fa150a1 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.3.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.3.sh @@ -41,18 +41,15 @@ if bashio::config.has_value 'networkdisks'; then # if Fail test different smb and sec versions while [ $? -ne 0 ]; do - # Declare all possible options - declare -a SMBVERSION='( ",vers=2.1" ",vers=3.0" ",vers=1.0" ",vers=3.1.1" ",vers=2.0" ",vers=3.0.2" )' - declare -a SECVERSION='( ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" )' - - # Test all options until successful - for SMBVERS in ${SMBVERSION[@]}; do - for SECVERS in ${SECVERSION[@]}; do - bashio::log.warning "... trying to mount with $SMBVERS$SECVERS " - mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}"$DOMAIN$SMBVERS $disk /mnt/$diskname || \ - mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}"$DOMAIN$SMBVERS$SECVERS $disk /mnt/$diskname - done - done + for SMBVERS in ",vers=2.1" ",vers=3.0" ",vers=1.0" ",vers=3.1.1" ",vers=2.0" ",vers=3.0.2" + do + for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" + do + bashio::log.warning "... trying to mount with $SMBVERS $SECVERS " + mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}"$DOMAIN$SMBVERS $disk /mnt/$diskname || \ + mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}"$DOMAIN$SMBVERS$SECVERS $disk /mnt/$diskname + done + done done fi @@ -67,3 +64,7 @@ if bashio::config.has_value 'networkdisks'; then done fi + + + +