diff --git a/bazarr/root/etc/cont-init.d/92-local_mounts.sh b/bazarr/root/etc/cont-init.d/92-local_mounts.sh new file mode 100644 index 000000000..f29116820 --- /dev/null +++ b/bazarr/root/etc/cont-init.d/92-local_mounts.sh @@ -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 diff --git a/bazarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh b/bazarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh deleted file mode 100644 index bdefdc56b..000000000 --- a/bazarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh +++ /dev/null @@ -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 diff --git a/bazarr/root/etc/cont-init.d/92-smb_mounts.sh b/bazarr/root/etc/cont-init.d/92-smb_mounts.sh index 7f766dbc1..3af6a1539 100644 --- a/bazarr/root/etc/cont-init.d/92-smb_mounts.sh +++ b/bazarr/root/etc/cont-init.d/92-smb_mounts.sh @@ -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 : $(