This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE2 - [RGMANAGER] Resolves #483093 - samba.sh tries tokill the wrong pid file
- From: Marek GrÃc <marx at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 2 Feb 2009 16:56:30 +0000 (UTC)
- Subject: cluster: STABLE2 - [RGMANAGER] Resolves #483093 - samba.sh tries tokill the wrong pid file
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c044ad0d53e277e5a33de0cb12d09dc28bc86d6a
Commit: c044ad0d53e277e5a33de0cb12d09dc28bc86d6a
Parent: f1dea0e9bf3e455b74a7ffc59d1245def133ef02
Author: Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate: Mon Feb 2 17:52:11 2009 +0100
Committer: Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Mon Feb 2 17:55:51 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 bb7862e..d1772d1 100644
--- a/rgmanager/src/resources/samba.sh
+++ b/rgmanager/src/resources/samba.sh
@@ -13,8 +13,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()