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: remove pid at killproc in initscript
Date: Mon, 02 Nov 2020 10:29:54 +0000
Message-ID: <00AFCF2D-58F3-44E5-B515-E81D8600B1FD@ipfire.org>
In-Reply-To: <20201101170608.5259-1-arne_f@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2336012967960425677=="
List-Id: <development.lists.ipfire.org>

--===============2336012967960425677==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

This looks okay to me.

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 1 Nov 2020, at 17:06, Arne Fitzenreiter <arne_f(a)ipfire.org> wrote:
> 
> 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>
> ---
> lfs/samba                      | 2 +-
> src/initscripts/packages/samba | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/lfs/samba b/lfs/samba
> index 92a6b1121..29dfec2e9 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    = 73
> +PAK_VER    = 74
> 
> 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)
> -- 
> 2.17.1
> 


--===============2336012967960425677==--