From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18754 invoked by alias); 2 Feb 2009 16:54:33 -0000 Received: (qmail 18679 invoked by alias); 2 Feb 2009 16:54:33 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: RHEL5 - [RGMANAGER] Resolves #483093 - samba.sh tries to kill the wrong pid file To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 0c637449a093e45aea57bbd2c8027674be7ad982 X-Git-Newrev: 2581f0d781390fe243355641ec0351cb56c16ad3 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090202165411.29361120597@lists.fedorahosted.org> Date: Mon, 02 Feb 2009 16:54:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00367.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=2581f0d781390fe243355641ec0351cb56c16ad3 Commit: 2581f0d781390fe243355641ec0351cb56c16ad3 Parent: 0c637449a093e45aea57bbd2c8027674be7ad982 Author: Marek 'marx' Grac AuthorDate: Mon Feb 2 17:52:11 2009 +0100 Committer: Marek 'marx' Grac CommitterDate: Mon Feb 2 17:52:11 2009 +0100 [RGMANAGER] Resolves #483093 - samba.sh tries to kill the wrong pid file Resource agent was using old pid file naming schema. Now it is 'smbd-$config_filename.pid'. Old schema was valid in RHEL4 --- rgmanager/src/resources/samba.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/resources/samba.sh b/rgmanager/src/resources/samba.sh index 70ea17f..da9a9e6 100755 --- a/rgmanager/src/resources/samba.sh +++ b/rgmanager/src/resources/samba.sh @@ -36,8 +36,8 @@ declare SAMBA_SMBD=/usr/sbin/smbd declare SAMBA_NMBD=/usr/sbin/nmbd declare SAMBA_pid_dir="`generate_name_for_pid_dir`" declare SAMBA_conf_dir="`generate_name_for_conf_dir`" -declare SAMBA_smbd_pid_file="$SAMBA_pid_dir/smbd.pid" -declare SAMBA_nmbd_pid_file="$SAMBA_pid_dir/nmbd.pid" +declare SAMBA_smbd_pid_file="$SAMBA_pid_dir/smbd-smb.conf.pid" +declare SAMBA_nmbd_pid_file="$SAMBA_pid_dir/nmbd-smb.conf.pid" declare SAMBA_gen_config_file="$SAMBA_conf_dir/smb.conf" verify_all()