Configure and makefile changes for newly added systemd unit files.

diff --git a/Makefile.in b/Makefile.in
index f7e34f4bb9228040ee801c9ecd909765339718c2..38c41a3c2455a592e8c5e2db410596adefa568eb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,6 +92,9 @@ install_system_dirs:
 install_initscripts: 
        $(MAKE) -C scripts install_initscripts
 
+install_systemd_units:
+       $(MAKE) -C scripts install_systemd_units
+
 LCOV_TRACES = libdm.info lib.info tools.info \
        daemons/dmeventd.info daemons/clvmd.info
 CLEAN_TARGETS += $(LCOV_TRACES)

diff --git a/WHATS_NEW b/WHATS_NEW
index c5ab744308f2e2e7aeb4bb476a850a4226e619c1..858e1298f7a0f17b7ac95138b574a153d680f4a9 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.87 - 
 ===============================
+  Add systemd unit file to provide lvm2 monitoring.
   Compare also file size to detect changed config file.
 
 Version 2.02.86 - 8th July 2011

diff --git a/configure.in b/configure.in
index 60796ad0fc49bee40587e1b5093fefff514bc425..d54d7d807c7634a37e02f805020d4e229c04d799 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1371,6 +1371,7 @@ AC_SUBST(UDEV_PC)
 AC_SUBST(UDEV_RULES)
 AC_SUBST(UDEV_SYNC)
 AC_SUBST(WRITE_INSTALL)
+AC_SUBST(DMEVENTD_PIDFILE)
 AC_SUBST(interface)
 AC_SUBST(kerneldir)
 AC_SUBST(missingkernel)
@@ -1417,6 +1418,8 @@ po/Makefile
 scripts/clvmd_init_red_hat
 scripts/cmirrord_init_red_hat
 scripts/lvm2_monitoring_init_red_hat
+scripts/dm_event_systemd_red_hat.service
+scripts/lvm2_monitoring_systemd_red_hat.service
 scripts/Makefile
 test/Makefile
 test/api/Makefile

diff --git a/make.tmpl.in b/make.tmpl.in
index cd8ae359085ad1450da883f50e09dc5bcac9251e..f003149c6d482a49e7f32420cb1f84f06ea594a7 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -65,6 +65,7 @@ staticdir = $(DESTDIR)@STATICDIR@
 udevdir = $(DESTDIR)@udevdir@
 pkgconfigdir = $(usrlibdir)/pkgconfig
 initdir = $(DESTDIR)@sysconfdir@/rc.d/init.d
+systemd_dir = $(DESTDIR)/lib/systemd/system
 ocf_scriptdir = $(DESTDIR)@OCFDIR@
 
 USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 5293cc358d291886d7b95108755085f089e47cef..7262fbb4fa7de92d424079f4e3a2f35b1de3b63d 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -53,4 +53,11 @@ ifeq ("@BUILD_CMIRRORD@", "yes")
        $(INSTALL_SCRIPT) cmirrord_init_red_hat $(initdir)/cmirrord
 endif
 
-DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat lvm2_monitoring_init_red_hat
+install_systemd_units:
+       $(INSTALL_DIR) $(systemd_dir)
+       $(INSTALL_DATA) dm_event_systemd_red_hat.socket $(systemd_dir)/dm-event.socket
+       $(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_dir)/dm-event.service
+       $(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_dir)/lvm2-monitor.service
+
+DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat lvm2_monitoring_init_red_hat \
+                    dm_event_systemd_red_hat.service lvm2_monitoring_systemd_red_hat.service