From 761ee7d1831af0bbee59227d0606928df781ab99 Mon Sep 17 00:00:00 2001 From: Veiko Aasa Date: Tue, 24 Sep 2024 13:12:49 +0300 Subject: [PATCH] samba: Fix nmb systemd service is in erroneous state Disable and mask the nmb service, which is alias to the already disabled nmbd service. Tests performed: - Upgrading Samba app works. - Systemd doesn't show nmb.service in erroneous state after upgrade. Signed-off-by: Veiko Aasa Reviewed-by: Sunil Mohan Adapa --- plinth/modules/samba/__init__.py | 2 +- plinth/modules/samba/privileged.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plinth/modules/samba/__init__.py b/plinth/modules/samba/__init__.py index 6a4c9e910..58c83640d 100644 --- a/plinth/modules/samba/__init__.py +++ b/plinth/modules/samba/__init__.py @@ -41,7 +41,7 @@ class SambaApp(app_module.App): app_id = 'samba' - _version = 5 + _version = 6 def __init__(self) -> None: """Create components for the app.""" diff --git a/plinth/modules/samba/privileged.py b/plinth/modules/samba/privileged.py index 77664adc0..6c6e18786 100644 --- a/plinth/modules/samba/privileged.py +++ b/plinth/modules/samba/privileged.py @@ -291,6 +291,8 @@ def setup(): action_utils.service_stop('nmbd') action_utils.service_disable('nmbd') action_utils.service_mask('nmbd') + action_utils.service_disable('nmb') + action_utils.service_mask('nmb') if action_utils.service_is_running('smbd'): action_utils.service_restart('smbd')