From patchwork Sun Nov 1 17:06:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 3622 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4CPMrx2TTDz3wl4 for ; Sun, 1 Nov 2020 17:06:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4CPMrt2YsCz1Ff; Sun, 1 Nov 2020 17:06:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4CPMrs2D9vz2y4G; Sun, 1 Nov 2020 17:06:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4CPMrr0l3Wz2xZC for ; Sun, 1 Nov 2020 17:06:20 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4CPMrp3pzxzv9; Sun, 1 Nov 2020 17:06:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1604250378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=aBG6uFSUQQLHGVAQ5Usosk4QE8aTtH5wPNtE7Vhu8hw=; b=Bb9FUx09rkG7He7AKarDNYQOxoLo6wzD5QE32twzqBUzfINIkGf1EmdQSSA49nQtZPvftn LkTN0mYbx41fdoBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1604250378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=aBG6uFSUQQLHGVAQ5Usosk4QE8aTtH5wPNtE7Vhu8hw=; b=tg8n2OI+26fIzqoNjYUdVaUTw/kUyHCIymzf3gBFvp0GUha6GK2XeJXw/qojUTm9K0IQPk 0PesEYi0PM1wZb8i50jUVwKWlS2C3wUTikudZ6MNfNLnsESAQyMHKWQZDucNCnKuTHlfRg 10m6dkeavK26gg1m38u9iU1y1BEabzItkGJMiskJAiix57lc1/UM6t+WTUT3ONjkubGSaQ Brtcpced0jQaDOCUlCCuSqhFQselYpVGi/L1FdYCSB8GHryNZ56V7DnMfvOqzlUuCnypoI nni/NT8nopgya9KNkRA8TCgzflbOl2u/T4bm2SRxrQVzN8ICDe1mCYftye11CA== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] samba: remove pid at killproc in initscript Date: Sun, 1 Nov 2020 18:06:08 +0100 Message-Id: <20201101170608.5259-1-arne_f@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" sometime a stale nmbd or smbd process prevent start of samba. this change should kill all processes. Signed-off-by: Arne Fitzenreiter Reviewed-by: Michael Tremer --- 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)