Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 0f19d2e7fb331ba3aedc69c6bd3eb5a75cf631c5
Parent: 792fdada8e5ec08ad0afc957d4899f4d62904b23
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Feb 13 06:15:32 2012 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Feb 13 06:15:32 2012 +0100
init/service scripts: make environment filename consistent with service name
Generally speaking if a service is called foo, users expects to pass
options to the script via /etc/sysconfig/foo and not foo_something.
This fix an oversight on my side in the previous round of init fixes.
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
init/dlm.init | 2 +-
init/dlm.service | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/init/dlm.init b/init/dlm.init
index db8f17f..7f3da2d 100644
--- a/init/dlm.init
+++ b/init/dlm.init
@@ -26,7 +26,7 @@ progdir="cluster"
lockfile="/var/run/$progdir/$prog.pid"
exec="/usr/sbin/$prog"
-[ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+[ -f /etc/sysconfig/dlm ] && . /etc/sysconfig/dlm
setup() {
modprobe dlm > /dev/null 2>&1
diff --git a/init/dlm.service b/init/dlm.service
index 7be2ffd..d7cf9c7 100644
--- a/init/dlm.service
+++ b/init/dlm.service
@@ -4,7 +4,7 @@ After=syslog.target network.target corosync.service
[Service]
Type=forking
-EnvironmentFile=/etc/sysconfig/dlm_controld
+EnvironmentFile=/etc/sysconfig/dlm
ExecStartPre=/sbin/modprobe dlm
ExecStart=/usr/sbin/dlm_controld $DLM_CONTROLD_OPTS
#ExecStopPost=/sbin/modprobe -r dlm