From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH] samba: wsdd started and stopped when samba started or stopped
Date: Fri, 01 Mar 2024 18:13:28 +0100
Message-ID: <85704fc2-2b93-4bcf-bffc-d690d0096b3b@ipfire.org>
In-Reply-To: <053E52A9-83BD-4067-B86D-650BD2DC5DDC@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5035904713577554951=="
List-Id: <development.lists.ipfire.org>

--===============5035904713577554951==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi Michael,

On 01/03/2024 17:17, Michael Tremer wrote:
> Hello,
>=20
> Hmm, I am not sure whether this change is too confusing=E2=80=A6
>=20
> We normally don=E2=80=99t call one initscript from another one (at least I =
am not aware).
>=20
> Would it not be better if we have a check in the wsdd initscript and skip l=
aunching the daemon if samba isn=E2=80=99t running? Or should we simply throw=
 away the wsdd initscript and launch the daemon in the samba initscript?
>=20
> Those options feel slightly cleaner to me. But since I lost the ball on thi=
s so badly, maybe I am overlooking the reason why you solved it this way.

I did think about putting the wsdd initscript start, stop & status=20
options into the samba initscript but thought that would make the samba=20
initscript much more complicated and if samba ends up adding the wsdd=20
functionality into itself then we would have to clear it out of the=20
samba initscript.

However, I also thought it was a bit clunky to call an initscript from=20
another initscript.

I think the first option of skipping launching the wsdd daemon if samba=20
isn't running wouldn't work so well if samba was then restarted because=20
wsdd would then be stopped and would not get started. Daniel was looking=20
at the situation of stopping the samba daemon and then modifying the=20
workgroup name and then restarting samba. If wsdd is not also re-started=20
then it will still have the old workgroup name and will not function=20
correctly until it is also restarted.

I think after your feedback, and thinking more about it, that adding the=20
wsdd start, stop & status functions directly into the samba initscript,=20
together with the ARGs etc functions, makes the most sense.

I would also remove the service option from wsdd lfs file so that it=20
does not get shown in the Addon Services page as it will no longer have=20
its own initscript. So you would only ever see the samba service as=20
being running or not. wsdd would be similar to

I will do a v2 version of the change and re-submit.

Regards,

Adolf.

>=20
> -Michael
>=20
>> On 29 Feb 2024, at 15:09, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> - Add wsdd as a dependency to samba so it will be installed together with =
samba
>> - Add the starting and stopping of wsdd into the samba initscript
>>
>> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> ---
>> lfs/samba                      | 4 ++--
>> src/initscripts/packages/samba | 6 +++++-
>> 2 files changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/lfs/samba b/lfs/samba
>> index 76088abfa..df7811313 100644
>> --- a/lfs/samba
>> +++ b/lfs/samba
>> @@ -33,9 +33,9 @@ DL_FROM    =3D $(URL_IPFIRE)
>> DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
>> TARGET     =3D $(DIR_INFO)/$(THISAPP)
>> PROG       =3D samba
>> -PAK_VER    =3D 99
>> +PAK_VER    =3D 100
>>
>> -DEPS       =3D avahi cups perl-Parse-Yapp perl-JSON
>> +DEPS       =3D avahi cups perl-Parse-Yapp perl-JSON wsdd
>>
>> SERVICES   =3D samba
>>
>> diff --git a/src/initscripts/packages/samba b/src/initscripts/packages/sam=
ba
>> index 93f14cd29..99b9929cf 100644
>> --- a/src/initscripts/packages/samba
>> +++ b/src/initscripts/packages/samba
>> @@ -42,6 +42,8 @@ case "$1" in
>>
>> boot_mesg "Starting winbind..."
>> loadproc /usr/sbin/winbindd
>> +
>> + /etc/rc.d/init.d/wsdd start
>> ;;
>>
>> stop)
>> @@ -53,7 +55,9 @@ case "$1" in
>>
>> boot_mesg "Stopping winbind..."
>> killproc /usr/sbin/winbindd
>> -                ;;
>> +
>> + /etc/rc.d/init.d/wsdd stop
>> +              ;;
>>
>> reload)
>> boot_mesg "Reloading smbd..."
>> --=20
>> 2.44.0
>>
>=20

--=20
Sent from my laptop

--===============5035904713577554951==--