systemd unit and sysconfig file for clvmd added

diff --git a/clvmd.service b/clvmd.service
new file mode 100644 (file)
index 0000000..4c63055
--- /dev/null
+++ b/clvmd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=cluster LVM daemon
+After=syslog.target network.target corosync.service dlm.service
+Requires=dlm.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/clvmd
+ExecStart=/usr/sbin/clvmd $CLVMDOPTS
+ExecReload=/usr/sbin/clvmd -R
+
+[Install]
+WantedBy=multi-user.target

diff --git a/clvmd.sysconfig b/clvmd.sysconfig
new file mode 100644 (file)
index 0000000..99ed4f7
--- /dev/null
+++ b/clvmd.sysconfig
@@ -0,0 +1,3 @@
+# CLVMDOPTS -- set command line options for clvmd
+# See clvmd man page for list of options.
+CLVMDOPTS="-T30"

diff --git a/lvm2.spec b/lvm2.spec
index 0783c0205eb367fca49b7c9c80b146643f057278..05e94b7593845d78494335d2372f69e7ac149708 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -41,6 +41,8 @@ Group:                Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
 # Source0-md5: 1ce5b7f9981e1d02dfd1d3857c8d9fbe
 Source1:       %{name}-tmpfiles.conf
+Source2:       clvmd.service
+Source3:       clvmd.sysconfig
 Patch0:                %{name}-selinux.patch
 Patch1:                %{name}-diet.patch
 Patch2:                device-mapper-dmsetup-export.patch
@@ -351,7 +353,7 @@ unset CC
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm}
+install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm,/etc/sysconfig}
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 
 %{__make} install install_system_dirs install_systemd_units install_initscripts \
@@ -362,6 +364,11 @@ install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
 
+%if %{with cluster}
+install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/clvmd.service
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/clvmd
+%endif
+
 mv $RPM_BUILD_ROOT%{_libdir}/lib*.so.* $RPM_BUILD_ROOT/%{_lib}
 for lib in $RPM_BUILD_ROOT/%{_lib}/lib*.so.*; do
        lib=$(echo $lib | sed -e "s#$RPM_BUILD_ROOT##g")
@@ -451,6 +458,8 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_usrsbindir}/clvmd
 %attr(754,root,root) /etc/rc.d/init.d/clvmd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clvmd
+%{systemdunitdir}/clvmd.service
 %{_mandir}/man8/clvmd.8*
 
 %files cmirrord