Merge pull request #163 from dianlight/release/10.0.2.nas

Releasing refs/heads/release/10.0.2.nas into master

sambanas/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 10.0.2-nas4
+###  🩹 BugFix
+- Fix mount bug for ha 2023.7.x without acl config.
+
 ## 10.0.2-nas3
 
 ### ✨ Features

sambanas/config.yaml

@@ -1,6 +1,6 @@
 ---
 name: Samba NAS
-version: 10.0.2-nas3
+version: 10.0.2-nas4
 slug: sambanas
 description: Expose Home Assistant disc with SMB/CIFS
 url: https://github.com/dianlight/hassio-addons/tree/master/sambanas
@@ -118,6 +118,6 @@ host_ipc: true
 #advanced: true
 homeassistant: 2023.06.0
 backup: hot
-# Gemt Points!!!
+# Get Points!!!
 auth_api: true
 

sambanas/rootfs/etc/s6-overlay/s6-rc.d/cifs-supervisor-mount/run

@@ -32,10 +32,13 @@ if [ -f /tmp/cifs_network ]; then
     #bashio::log "Samba Ready: ${status}"
     #bashio::log "Children: $(smbcontrol smbd num-children)"
 
+    bashio::log "Wait Samba Server to going up..(max 30s)"
+    timeout 30 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' ${ipaddress/\/*/} 445
+
     while read -r -a device; do
         [[ "share config addons ssl backup media" =~ $device ]] && continue
         usage=$(jq -r --arg xshare "$device" '.acl[] | select(.share==$xshare) | .usage // "media"' <<<"$(bashio::addon.config)")
-        cmdshare=$(jq -nrc --arg usage "$usage" --arg share "$device" --arg ip "${ipaddress/\/*/}" --arg user "$username" --arg pwd "$password" '.name=$share|.usage=$usage|.type="cifs"|.server=$ip|.share=$share|.username=$user|.password=$pwd')
+        cmdshare=$(jq -nrc --arg usage "${usage:-media}" --arg share "$device" --arg ip "${ipaddress/\/*/}" --arg user "$username" --arg pwd "$password" '.name=$share|.usage=$usage|.type="cifs"|.server=$ip|.share=$share|.username=$user|.password=$pwd')
         #bashio::log.info "${cmdshare}"
         status=$(bashio::api.supervisor POST /mounts "${cmdshare}")
         #bashio::log.info "Return from Mount: ${status}"