From c2aae115317834d48e409a678f0f4082924b89a7 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fdinitto@redhat.com>
Date: Mon, 6 Feb 2012 13:32:46 +0100
Subject: [PATCH] more systemd bits

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 dlm.spec                        |  7 ++++++-
 fix_systemd_service_part2.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 fix_systemd_service_part2.patch

diff --git a/dlm.spec b/dlm.spec
index 09560f3..cbdee8e 100644
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,6 +1,6 @@
 Name:           dlm
 Version:        3.99.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2 and GPLv2+ and LGPLv2+
 # For a breakdown of the licensing, see README.license
 Group:          System Environment/Kernel
@@ -14,6 +14,7 @@ Requires:       %{name}-lib = %{version}-%{release}
 Source0:	http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
 Patch0:		fix_udev_rules.patch
 Patch1:		fix_systemd_service.patch
+Patch2:		fix_systemd_service_part2.patch
 
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -27,6 +28,7 @@ The kernel dlm requires a user daemon to control cluster membership.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # upstream does not require configure
@@ -100,6 +102,9 @@ developing applications that use %{name}.
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Feb  6 2012 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.99.0-5
+- Fix systemd service to recognize /etc/sysconfig/dlm_controld
+
 * Fri Feb  3 2012 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.99.0-4
 - Fix systemd service to modprobe dlm
 
diff --git a/fix_systemd_service_part2.patch b/fix_systemd_service_part2.patch
new file mode 100644
index 0000000..726fb90
--- /dev/null
+++ b/fix_systemd_service_part2.patch
@@ -0,0 +1,26 @@
+commit 3a7c2f696f00b2edfcbc4a5b7cd2cd7128f61f0a
+Author: Fabio M. Di Nitto <fdinitto@redhat.com>
+Date:   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@redhat.com>
+
+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]