mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-01-19 19:18:10 +01:00
Rewrite completly cifs code
Rewrite completly cifs code to take into account all possibilities
This commit is contained in:
Alexandre
@@ -1,77 +0,0 @@
|
||||
#!/usr/bin/with-contenv bashio
|
||||
|
||||
####################
|
||||
# MOUNT SMB SHARES #
|
||||
####################
|
||||
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')
|
||||
|
||||
if bashio::config.has_value 'cifsdomain'; then
|
||||
DOMAIN=",domain=$(bashio::config 'cifsdomain')"
|
||||
else
|
||||
DOMAIN=""
|
||||
fi
|
||||
|
||||
# Mounting disks
|
||||
for disk in ${MOREDISKS//,/ } # Separate comma separated values
|
||||
do
|
||||
disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
|
||||
diskname=${disk//\\//} #replace \ with /
|
||||
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}$DOMAIN $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$DOMAIN $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$DOMAIN $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$DOMAIN $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$DOMAIN $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$DOMAIN $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$DOMAIN $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.fatal "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.fatal "Unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
|
||||
fi
|
||||
|
||||
done
|
||||
fi
|
||||
63
qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.3.sh
Normal file
63
qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.3.sh
Normal file
@@ -0,0 +1,63 @@
|
||||
#!/usr/bin/with-contenv bashio
|
||||
|
||||
####################
|
||||
# MOUNT SMB SHARES #
|
||||
####################
|
||||
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')
|
||||
|
||||
if bashio::config.has_value 'cifsdomain'; then
|
||||
DOMAIN=",domain=$(bashio::config 'cifsdomain')"
|
||||
else
|
||||
DOMAIN=""
|
||||
fi
|
||||
|
||||
# Mounting disks
|
||||
for disk in ${MOREDISKS//,/ } # Separate comma separated values
|
||||
do
|
||||
# Clean name of network share
|
||||
disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
|
||||
diskname=${disk//\\//} #replace \ with /
|
||||
diskname=${diskname##*/} # Get only last part of the name
|
||||
# Prepare mount point
|
||||
mkdir -p /mnt/$diskname
|
||||
chown -R root:root /mnt/$diskname
|
||||
|
||||
#Tries to mount with default options
|
||||
mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}"$DOMAIN $disk /mnt/$diskname
|
||||
|
||||
# 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" ",sec=" )
|
||||
|
||||
# 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,uid=$(id -u),gid=$(id -g),forceuid,forcegid,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}"$DOMAIN $disk /mnt/$diskname || \
|
||||
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
|
||||
|
||||
# Messages
|
||||
if [ $? = 0 ]; then
|
||||
bashio::log.info "... $disk successfully mounted to /mnt/$diskname"
|
||||
#Test write permissions
|
||||
touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze || bashio::log.fatal "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" # Mount share
|
||||
fi
|
||||
|
||||
done
|
||||
fi
|
||||
Reference in New Issue
Block a user