🐛 [SambaNAS] medialibrary can't use moredisks that contain a reserved word

Addon

SambaNAS

Description

moredisks had the issue where a reserved word such as 'Media' couldn't be used as a disk name, but this was fixed to check if that reserved word is disabled in the ACL settings. The fix doesn't seem to apply to the medialibrary setting - I have moredisks 'Media' and 'Photos', and after enabling medialibrary I can see the contents of Photos in /media/PHOTOS, but Media is not mapped. Maybe in sambanas/rootfs/etc/s6-overlay/s6-rc.d/cifs-supervisor-mount/run?

Reproduction steps

1. Have a disk labeled 'Media'
2. Add the disk in moredisks
3. Enable medialibrary
4. /media doesn't have the disk mounted

Addon Logs

[19:45:25] INFO: Docker Interface: hassio 172.30.32.0/23
=== START OF ENABLE/DISABLE COMMANDS SECTION ===
SMART Enabled.
SMART Attribute Autosave Enabled.
SMART Automatic Offline Testing Enabled every four hours.

[19:45:25] INFO: Enabling S.M.A.R.T for /dev/sdb
smartctl 7.4 2023-08-01 r5530 [x86_64-linux-6.6.46-haos] (local build)
Copyright (C) 2002-23, Bruce Allen, Christian Franke, www.smartmontools.org

=== START OF ENABLE/DISABLE COMMANDS SECTION ===
SMART Enabled.
SMART Attribute Autosave Enabled.
SMART Automatic Offline Testing Enabled every four hours.

[19:45:25] INFO: Enabling S.M.A.R.T for /dev/sdc
smartctl 7.4 2023-08-01 r5530 [x86_64-linux-6.6.46-haos] (local build)
Copyright (C) 2002-23, Bruce Allen, Christian Franke, www.smartmontools.org

=== START OF ENABLE/DISABLE COMMANDS SECTION ===
SMART Enabled.
SMART Enable Attribute Autosave failed: scsi error badly formed scsi parameters

A mandatory SMART command failed: exiting. To continue, add one or more '-T permissive' options.
[19:45:25] INFO: Enabling S.M.A.R.T for /dev/sdd
smartctl 7.4 2023-08-01 r5530 [x86_64-linux-6.6.46-haos] (local build)
Copyright (C) 2002-23, Bruce Allen, Christian Franke, www.smartmontools.org

tdbsam_open: Converting version 0.0 database to version 4.0.
tdbsam_convert_backup: updated /var/lib/samba/private/passdb.tdb file.
=== START OF ENABLE/DISABLE COMMANDS SECTION ===
SMART Enabled.
SMART Attribute Autosave Enabled.
SMART Automatic Offline Testing Enabled every four hours.

s6-rc: info: service init-smartd successfully started
Added user nas.
Added user _ha_mount_user_.
---------------------------------------------------
[19:45:26] INFO: Exposed Disks Summary:
[MEDIA]                 path = /mnt/Media # TM:true USAGE:media  FS:ext4  #
[PHOTOS]                path = /mnt/Photos # TM:true USAGE:media  FS:ext4  #
---------------------------------------------------
s6-rc: info: service init-samba successfully started
s6-rc: info: service init-mqtt: starting
s6-rc: info: service wsdd: starting
s6-rc: info: service smbd: starting
s6-rc: info: service nmbd: starting
s6-rc: info: service avahi: starting
s6-rc: info: service wsdd successfully started
s6-rc: info: service smbd successfully started
s6-rc: info: service avahi successfully started
s6-rc: info: service nmbd successfully started
s6-rc: info: service cifs-supervisor-mount: starting
nmbd version 4.18.9 started.
Copyright Andrew Tridgell and the Samba Team 1992-2023
[19:45:26] INFO: Starting the AVAHI for homeassistant...
Waiting for daemon ...
[19:45:26] INFO: Automount Shares...
[19:45:26] INFO: MQTT support not enabled in config
s6-rc: info: service init-mqtt successfully started
[19:45:26] INFO: Starting the wsdd daemon for WORKGROUP/homeassistant...
smbd version 4.18.9 started.
Copyright Andrew Tridgell and the Samba Team 1992-2023
INFO: Profiling support unavailable in this build.
[19:45:26] INFO: Interfaces: -i enp0s25 
[19:45:26] INFO: Wait Samba Server to going up..(max 30s)
2024-09-01 19:45:26,356:wsdd INFO(pid 438): using pre-defined UUID cb6a33a0-b841-531d-a34e-09ecec492eb1
2024-09-01 19:45:26,357:wsdd INFO(pid 438): joined multicast group 239.255.255.250 on 192.168.1.113%enp0s25
2024-09-01 19:45:26,358:wsdd INFO(pid 438): scheduling Hello message via enp0s25 to 239.255.255.250%enp0s25
2024-09-01 19:45:26,426:wsdd INFO(pid 438): joined multicast group [ff02::c] on fe80::8d89:25d5:3adb:d398%enp0s25
2024-09-01 19:45:26,426:wsdd INFO(pid 438): scheduling Hello message via enp0s25 to ff02::c%enp0s25
2024-09-01 19:45:26,494:wsdd INFO(pid 438): 192.168.1.110 - - "POST /cb6a33a0-b841-531d-a34e-09ecec492eb1 HTTP/1.1" 200 -
2024-09-01 19:45:26,500:wsdd INFO(pid 438): 192.168.1.112 - - "POST /cb6a33a0-b841-531d-a34e-09ecec492eb1 HTTP/1.1" 200 -
2024-09-01 19:45:26,515:wsdd INFO(pid 438): fe80::cc9:7f7c:fce:ccb9 - - "POST /cb6a33a0-b841-531d-a34e-09ecec492eb1 HTTP/1.1" 200 -

No locked files
Samba version 4.18.9
PID     Username     Group        Machine                                   Protocol Version  Encryption           Signing              
----------------------------------------------------------------------------------------------------------------------------------------

Service      pid     Machine       Connected at                     Encryption   Signing     
---------------------------------------------------------------------------------------------

s6-rc: info: service cifs-supervisor-mount successfully started
s6-rc: info: service mqtt-disk-handler: starting
s6-rc: info: service mqtt-disk-handler successfully started
s6-rc: info: service mqtt-handler: starting
s6-rc: info: service mqtt-handler successfully started
s6-rc: info: service legacy-services: starting
s6-rc: info: service legacy-services successfully started
2024-09-01 19:45:32,199:wsdd INFO(pid 438): 192.168.1.110:63134(enp0s25) - - "Resolve urn:uuid:7665deeb-6ee6-4a44-a5b9-b4e9d6502973 UDP" - -
2024-09-01 19:45:44,591:wsdd INFO(pid 438): [fe80::cc9:7f7c:fce:ccb9]:54219(enp0s25) - - "Resolve urn:uuid:6573a122-9cba-4c68-b47b-c2134955f578 UDP" - -
*****

Samba name server HOMEASSISTANT is now a local master browser for workgroup WORKGROUP on subnet 172.30.32.1

*****

Addon Config

workgroup: WORKGROUP
username: nas
allow_hosts:
  - 10.0.0.0/8
  - 172.16.0.0/12
  - 192.168.0.0/16
  - 169.254.0.0/16
  - fe80::/10
  - fc00::/7
automount: false
moredisks:
  - Media
  - Photos
mountoptions:
  - nosuid
  - relatime
  - noexec
available_disks_log: true
medialibrary:
  enable: true
veto_files:
  - ._*
  - .DS_Store
  - Thumbs.db
  - icon?
  - .Trashes
compatibility_mode: false
recyle_bin_enabled: false
wsdd2: false
mqtt_nexgen_entities: false
autodiscovery: {}
other_users: []
acl:
  - share: addons
    disabled: true
  - share: backup
    disabled: true
  - share: config
    disabled: true
  - share: addon_configs
    disabled: true
  - share: media
    disabled: true
  - share: share
    disabled: true
  - share: ssl
    disabled: true
interfaces: []
mqtt_use_legacy_entities: false
password: ***

Architecture

amd64

OS

HaOS

dianlight / hassio-addons

🐛 [SambaNAS] medialibrary can't use moredisks that contain a reserved word #250