[packages/dlm] Pull /sys/kernel/config mount when started via systemd

jajcus jajcus at pld-linux.org
Mon Jan 6 12:10:09 CET 2014


commit 609143de1da86f26d667a872258d4c0984aa475b
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Mon Jan 6 12:09:56 2014 +0100

    Pull /sys/kernel/config mount when started via systemd

 dlm-systemd-configfs.patch | 10 ++++++++++
 dlm.spec                   |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/dlm.spec b/dlm.spec
index cb73222..6ed8059 100644
--- a/dlm.spec
+++ b/dlm.spec
@@ -15,6 +15,7 @@ Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.tmpfiles
 Source4:	dlm.conf
+Patch0:		%{name}-systemd-configfs.patch
 URL:		http://sources.redhat.com/cluster/dlm/
 BuildRequires:	corosync-devel >= 2.0
 %{?with_dlm_stonith:BuildRequires:	libxml2-devel >= 2.0}
@@ -24,7 +25,7 @@ BuildRequires:	rpmbuild(macros) >= 1.644
 BuildRequires:	systemd-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-scripts
-Requires:	systemd-units >= 38
+Requires:	systemd-units >= 208-8
 Requires(post,preun):	/sbin/chkconfig
 Obsoletes:	cluster-dlm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -68,6 +69,8 @@ Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
 %{__make} \
 	PREFIX=%{_prefix} \
diff --git a/dlm-systemd-configfs.patch b/dlm-systemd-configfs.patch
new file mode 100644
index 0000000..ac94eb0
--- /dev/null
+++ b/dlm-systemd-configfs.patch
@@ -0,0 +1,10 @@
+diff -dur dlm-4.0.2.orig/init/dlm.service dlm-4.0.2/init/dlm.service
+--- dlm-4.0.2.orig/init/dlm.service	2013-07-31 17:50:26.000000000 +0200
++++ dlm-4.0.2/init/dlm.service	2014-01-06 12:07:28.823033320 +0100
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=dlm control daemon
++Requires=sys-kernel-config.mount
+ After=syslog.target network.target corosync.service sys-kernel-config.mount
+ 
+ [Service]
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dlm.git/commitdiff/609143de1da86f26d667a872258d4c0984aa475b



More information about the pld-cvs-commit mailing list