Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: d65bbd39b052b56a1277ae1b3d7472b17140a9e5
Parent: da0d0e0e4fee1bac432304f9a792de8bd89c36d2
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Fri Jan 14 10:03:15 2011 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Jan 14 10:03:15 2011 +0100
cman init: do not include wrong default file
A recent change in glibc and shadow-utils (also in RHEL6) did add /etc/default
(same as debian based distros) introducing a possible bug in detecting the
correct default settings for the init script.
The window is very small as we don´t document the usage of /etc/default/cman,
but I don´t see a reason to take a chance. The fix is one liner to backport.
Resolves: rhbz#669340
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/init.d/cman.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index ea8293c..972a814 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -64,7 +64,7 @@ if [ -d /etc/sysconfig ]; then
fi
# deb based distros
-if [ -d /etc/default ]; then
+if [ ! -d /etc/sysconfig ]; then
[ -f /etc/default/cluster ] && . /etc/default/cluster
[ -f /etc/default/cman ] && . /etc/default/cman
[ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/cman"