[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 31cbb589d9c8610ba0d9b15e2cb1612ac05912a6

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 31cbb589d9c8610ba0d9b15e2cb1612ac05912a6

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2356 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  31cbb589d9c8610ba0d9b15e2cb1612ac05912a6 (commit)
      from  1e2c442c9e2d11590af214bdddde5cf0506e0a52 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31cbb589d9c8610ba0d9b15e2cb1612ac05912a6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Nov 1 18:06:08 2020 +0100

    samba: remove pid at killproc in initscript
    
    sometime a stale nmbd or smbd process prevent start of samba.
    this change should kill all processes.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/samba                      | 2 +-
 src/initscripts/packages/samba | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/lfs/samba b/lfs/samba
index 29dfec2e9..f57a04737 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 74
+PAK_VER    = 75
 
 DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp
 
diff --git a/src/initscripts/packages/samba b/src/initscripts/packages/samba
index 2aab39977..fbab2dabe 100644
--- a/src/initscripts/packages/samba
+++ b/src/initscripts/packages/samba
@@ -31,13 +31,13 @@ case "$1" in
 
 	stop)
 		boot_mesg "Stopping smbd..."
-		killproc -p /var/run/smbd.pid /usr/sbin/smbd
+		killproc /usr/sbin/smbd
 
 		boot_mesg "Stopping nmbd..."
-		killproc -p /var/run/nmbd.pid /usr/sbin/nmbd
+		killproc /usr/sbin/nmbd
 
 		boot_mesg "Stopping winbind..."
-		killproc -p /var/run/winbindd.pid /usr/sbin/winbindd
+		killproc /usr/sbin/winbindd
                 ;;
 
 	reload)


hooks/post-receive
--
IPFire 2.x development tree