From 54a26f7741a26259ac238e72d151906be4b2b0df Mon Sep 17 00:00:00 2001 From: Veiko Aasa Date: Sat, 3 Sep 2022 17:11:37 +0300 Subject: [PATCH] samba: Ignore mounted files when listing mounts In a testing container, checked that the mount point /run/host/os-release is not listed on the Samba app page. Signed-off-by: Veiko Aasa Reviewed-by: Sunil Mohan Adapa --- plinth/modules/samba/views.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plinth/modules/samba/views.py b/plinth/modules/samba/views.py index c725670b9..17ab9d87e 100644 --- a/plinth/modules/samba/views.py +++ b/plinth/modules/samba/views.py @@ -28,11 +28,12 @@ def get_share_mounts(): for mount in storage.get_mounts(): mount_point = mount['mount_point'] - if mount_point not in ignore_mounts: - basename = os.path.basename(mount_point) - mount['name'] = basename or _('FreedomBox OS disk') - mount['share_name_prefix'] = basename or 'disk' - mounts.append(mount) + if mount_point in ignore_mounts or os.path.isfile(mount_point): + continue + basename = os.path.basename(mount_point) + mount['name'] = basename or _('FreedomBox OS disk') + mount['share_name_prefix'] = basename or 'disk' + mounts.append(mount) return sorted(mounts, key=lambda k: k['mount_point'])