dlm: master - systemd: align with init script functionalities

Fabio M. Di Nitto fabbione at fedoraproject.org
Mon Feb 6 12:27:46 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3a7c2f696f00b2edfcbc4a5b7cd2cd7128f61f0a
Commit:        3a7c2f696f00b2edfcbc4a5b7cd2cd7128f61f0a
Parent:        1ea3f422e7add8730e07029fc9f30aa38ddded2f
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Mon Feb 6 13:26:47 2012 +0100
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Mon Feb 6 13:26:47 2012 +0100

systemd: align with init script functionalities

Enable use of /etc/sysconfig/dlm_controld and use DLM_CONTROLD_OPTS
for both systemd and init script

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 init/dlm.service |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/init/dlm.service b/init/dlm.service
index 17579c2..7be2ffd 100644
--- a/init/dlm.service
+++ b/init/dlm.service
@@ -4,8 +4,9 @@ After=syslog.target network.target corosync.service
 
 [Service]
 Type=forking
+EnvironmentFile=/etc/sysconfig/dlm_controld
 ExecStartPre=/sbin/modprobe dlm 
-ExecStart=/usr/sbin/dlm_controld $OPTIONS
+ExecStart=/usr/sbin/dlm_controld $DLM_CONTROLD_OPTS
 #ExecStopPost=/sbin/modprobe -r dlm
 
 [Install]


More information about the cluster-commits mailing list