Fix reserved names

dianlight · Nov 17, 2023 · 58f76e8 · 58f76e8
1 parent 48b7d01
commit 58f76e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/sambanas/rootfs/etc/s6-overlay/s6-rc.d/cifs-supervisor-mount/finish b/sambanas/rootfs/etc/s6-overlay/s6-rc.d/cifs-supervisor-mount/finish
@@ -10,7 +10,7 @@ if [ -f /tmp/cifs_network ]; then
   available_shares=$(awk '/\[(.*)\]/{ DISK=substr($1,2,length($1)-2); next } /.*path =(.*)/{ printf "%s\n",DISK,$0 }' /etc/samba/smb.conf)
 
   while read -r -a device; do
-    [[ "share config addons ssl backup media" =~ $device ]] && continue
+    [[ "share config addons ssl backup media all_addon_configs homeassistant" =~ $device ]] && continue
     status=$(bashio::api.supervisor DELETE /mounts/${device})
     bashio::log.info "Return from Umount ${status}"
   done <<<"${available_shares}"

diff --git a/sambanas/rootfs/etc/s6-overlay/s6-rc.d/cifs-supervisor-mount/run b/sambanas/rootfs/etc/s6-overlay/s6-rc.d/cifs-supervisor-mount/run
@@ -36,7 +36,7 @@ if [ -f /tmp/cifs_network ]; then
     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
+        [[ "share config addons ssl backup media all_addon_configs homeassistant" =~ $device ]] && continue
         usage=$(jq -r --arg xshare "$device" '.acl[] | select(.share==$xshare) | .usage // "media"' <<<"$(bashio::addon.config)")
         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}"

diff --git a/sambanas/rootfs/etc/s6-overlay/s6-rc.d/init-automount/run b/sambanas/rootfs/etc/s6-overlay/s6-rc.d/init-automount/run
@@ -47,7 +47,7 @@ function disk2label() { # $1 disk  return (label disk or id)
 function reserved_mount_name() { # $1 disk $2 cleanmountdisks
      disk=$1
      cleanmountdisks=$2
-     reserved_names=(config addons ssl share backup media)
+     reserved_names=(config addons ssl share backup media all_addon_configs homeassistant)
      for disk in "${reserved_names[@]}"; do
           if [[ ${cleanmountdisks[@]} =~ $disk ]]; then
                tomountdisks=("${cleanmountdisks[@]/$disk/}")