[sanlock/f17] systemd fixes

[Federico Simoncelli]

commit c0aa66abaf6a0a23b4ac25d8f2826b187a3ae639
Author: David Teigland <teigland at redhat.com>
Date:   Tue Nov 6 14:03:24 2012 -0600

    systemd fixes

 0003-fix-systemd-service-files.patch |   47 ++++++++++++++++++++++++++++++++++
 sanlock.spec                         |    7 ++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/0003-fix-systemd-service-files.patch b/0003-fix-systemd-service-files.patch
new file mode 100644
index 0000000..b496c66
--- /dev/null
+++ b/0003-fix-systemd-service-files.patch
@@ -0,0 +1,47 @@
+From 337c30353d650bd02bd1203b7859124926dfef71 Mon Sep 17 00:00:00 2001
+From: David Teigland <teigland at redhat.com>
+Date: Mon, 5 Nov 2012 15:53:40 -0600
+Subject: [PATCH] fix systemd service files
+
+add [Unit] and disable the cgroup stuff to avoid
+the set_scheduler failures
+
+Signed-off-by: David Teigland <teigland at redhat.com>
+---
+ init.d/sanlock.service        |    2 ++
+ init.d/wdmd.service           |    2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/init.d/sanlock.service b/init.d/sanlock.service
+index ff4a3e7..f026fe0 100644
+--- a/init.d/sanlock.service
++++ b/init.d/sanlock.service
+@@ -1,8 +1,10 @@
++[Unit]
+ Description=Shared Storage Lease Manager
+ After=syslog.target wdmd.service
+ 
+ [Service]
+ Type=forking
++ControlGroup=cpu:/
+ ExecStart=/lib/systemd/systemd-sanlock start
+ ExecStop=/lib/systemd/systemd-sanlock stop
+ 
+diff --git a/init.d/wdmd.service b/init.d/wdmd.service
+index 88d00b6..efe46bf 100644
+--- a/init.d/wdmd.service
++++ b/init.d/wdmd.service
+@@ -1,8 +1,10 @@
++[Unit]
+ Description=Watchdog Multiplexing Daemon
+ After=syslog.target
+ 
+ [Service]
+ Type=forking
++ControlGroup=cpu:/
+ ExecStart=/lib/systemd/systemd-wdmd start
+ ExecStop=/lib/systemd/systemd-wdmd stop
+ 
+-- 
+1.7.10.1.362.g242cab3
+
diff --git a/sanlock.spec b/sanlock.spec
index 3fe7372..3402585 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -1,6 +1,6 @@
 Name:           sanlock
 Version:        2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A shared disk lock manager
 
 Group:          System Environment/Base
@@ -15,6 +15,7 @@ Source0:        https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}
 
 Patch0: 0001-daemon-include-resource.h.patch
 Patch1: 0002-daemon-fix-lockfile-ownership.patch
+Patch2: 0003-fix-systemd-service-files.patch
 
 %description
 sanlock uses disk paxos to manage leases on shared storage.
@@ -25,6 +26,7 @@ access to the shared disks.
 %setup -q
 %patch0 -p1 -b .0001-daemon-include-resource.h.patch
 %patch1 -p1 -b .0002-daemon-fix-lockfile-ownership.patch
+%patch2 -p1 -b .0003-fix-systemd-service-files.patch
 
 %build
 # upstream does not require configure
@@ -185,6 +187,9 @@ developing applications that use %{name}.
 %{_includedir}/sanlock_direct.h
 
 %changelog
+* Mon Nov 05 2012 Federico Simoncelli <fsimonce at redhat.com> - 2.4-3
+- fix systemd service files
+
 * Tue Jul 24 2012 David Teigland <teigland at redhat.com> - 2.4-2
 - fix lockfile ownership