Hello,
Hmm, I am not sure whether this change is too confusing…
We normally don’t 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 launching the daemon if samba isn’t running? Or should we simply throw away 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@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@ipfire.org Signed-off-by: Adolf Belka adolf.belka@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 = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 99 +PAK_VER = 100
-DEPS = avahi cups perl-Parse-Yapp perl-JSON +DEPS = avahi cups perl-Parse-Yapp perl-JSON wsdd
SERVICES = samba
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
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..." -- 2.44.0