align local mount code

This commit is contained in:
Alexandre
2021-10-23 20:06:20 +02:00
parent 516e5d6a1c
commit e4e4aef778
23 changed files with 341 additions and 310 deletions

View File

@@ -0,0 +1,27 @@
#!/usr/bin/with-contenv bashio
######################
# MOUNT LOCAL SHARES #
######################
MOUNTPOINTS="share"
bashio::log.info 'Mounting external hdd...'
# Mount local Share if configured and if Protection Mode is active
if bashio::config.has_value 'localdisks'; then
MOREDISKS=$(bashio::config 'localdisks')
bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
# Separate comma separated values
for disk in ${MOREDISKS//,/ }; do
bashio::log.info "Mount ${disk}"
mkdir -p /$MOUNTPOINTS/$disk &&
if [ ! -d /$MOUNTPOINTS/$disk ]; then
echo "Creating /$MOUNTPOINTS/$disk"
mkdir -p /$MOUNTPOINTS/$disk
chown -R abc:abc /$MOUNTPOINTS/$disk
fi
mount /dev/$disk /$MOUNTPOINTS/$disk &&
bashio::log.info "Success! Mounted to /$MOUNTPOINTS/$disk"
done ||
bashio::log.warning "Unable to mount local drives!"
fi

View File

@@ -1,26 +0,0 @@
#!/usr/bin/with-contenv bashio
######################
# MOUNT LOCAL SHARES #
######################
bashio::log.info 'Mounting external hdd...'
# Mount local Share if configured and if Protection Mode is active
if bashio::config.has_value 'localdisks'; then
MOREDISKS=$(bashio::config 'localdisks')
bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \
for disk in ${MOREDISKS//,/ } # Separate comma separated values
do
bashio::log.info "Mount ${disk}"
mkdir -p /share/$disk && \
if [ ! -d /share/$disk ]; then
echo "Creating /share/$disk"
mkdir -p /share/$disk
chown -R abc:abc /share/$disk
fi
mount /dev/$disk /share/$disk && \
bashio::log.info "Success!"
done || \
bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
fi

View File

@@ -39,11 +39,6 @@ if bashio::config.has_value 'networkdisks'; then
exit 1
fi
# Test if ip is available
if [ ping 127.0.0.1 -c 1 &>/dev/null ]; then
fi
# Prepare mount point
mkdir -p /mnt/$diskname
chown -R root:root /mnt/$diskname
@@ -64,9 +59,9 @@ if bashio::config.has_value 'networkdisks'; then
# Messages
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
# Mounting failed messages
@@ -76,12 +71,11 @@ if bashio::config.has_value 'networkdisks'; then
# Provide debugging info
smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
disk="//192.168.178.23/NAS"
CIFS_USERNAME="homeassistant"
CIFS_PASSWORD="Bonjour01"
#smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true
smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true
#smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true
smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true
# Error code
bashio::log.fatal "Error read : $(<ERRORCODE)"