init/service scripts: make environment filename consistent with servi…

…ce 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 <[email protected]>
goldwynr · Feb 13, 2012 · 0f19d2e · 0f19d2e
1 parent 792fdad
commit 0f19d2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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