From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@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 17:17:05 +0100
Message-ID: <053E52A9-83BD-4067-B86D-650BD2DC5DDC@ipfire.org>
In-Reply-To: <20240229140937.15643-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4246109939908538117=="
List-Id: <development.lists.ipfire.org>

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

Hello,

Hmm, I am not sure whether this change is too confusing=E2=80=A6

We normally don=E2=80=99t call one initscript from another one (at least I am=
 not aware).

Would it not be better if we have a check in the wsdd initscript and skip lau=
nching the daemon if samba isn=E2=80=99t running? Or should we simply throw a=
way the wsdd initscript and launch the daemon in the samba initscript?

Those options feel slightly cleaner to me. But since I lost the ball on this =
so badly, maybe I am overlooking the reason why you solved it this way.

-Michael

> On 29 Feb 2024, at 15:09, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - Add wsdd as a dependency to samba so it will be installed together with s=
amba
> - Add the starting and stopping of wsdd into the samba initscript
>=20
> 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(-)
>=20
> 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
>=20
> -DEPS       =3D avahi cups perl-Parse-Yapp perl-JSON
> +DEPS       =3D avahi cups perl-Parse-Yapp perl-JSON wsdd
>=20
> SERVICES   =3D samba
>=20
> diff --git a/src/initscripts/packages/samba b/src/initscripts/packages/samba
> index 93f14cd29..99b9929cf 100644
> --- a/src/initscripts/packages/samba
> +++ b/src/initscripts/packages/samba
> @@ -42,6 +42,8 @@ case "$1" in
>=20
> boot_mesg "Starting winbind..."
> loadproc /usr/sbin/winbindd
> +=20
> + /etc/rc.d/init.d/wsdd start
> ;;
>=20
> stop)
> @@ -53,7 +55,9 @@ case "$1" in
>=20
> boot_mesg "Stopping winbind..."
> killproc /usr/sbin/winbindd
> -                ;;
> +=20
> + /etc/rc.d/init.d/wsdd stop
> +              ;;
>=20
> reload)
> boot_mesg "Reloading smbd..."
> --=20
> 2.44.0
>=20


--===============4246109939908538117==--