From da532741c98678536b7620e6121b45ef0f28b11b Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Thu, 23 Feb 2012 11:24:07 +0000 Subject: [PATCH] Add LVMetaD systemd units. --- WHATS_NEW | 1 + configure | 3 ++- configure.in | 1 + scripts/Makefile.in | 4 ++++ scripts/lvm2_lvmetad_systemd_red_hat.service.in | 15 +++++++++++++++ scripts/lvm2_lvmetad_systemd_red_hat.socket | 10 ++++++++++ 6 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 scripts/lvm2_lvmetad_systemd_red_hat.service.in create mode 100644 scripts/lvm2_lvmetad_systemd_red_hat.socket diff --git a/WHATS_NEW b/WHATS_NEW index 6a55c8b3f..1d8bd5269 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.93 - ==================================== + Add LVMetaD systemd units. Fix allocation code to allow replacement of single RAID 4/5/6 device. Check all tags and LV names are in a valid form in vg_validate. Add tmpfiles.d style configuration for lvm2 lock and run directory. diff --git a/configure b/configure index e43b4bde1..644a9b75a 100755 --- a/configure +++ b/configure @@ -10426,7 +10426,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/common/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile doc/Makefile doc/example.conf include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile 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/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/common/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile doc/Makefile doc/example.conf include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -11152,6 +11152,7 @@ do "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; "scripts/clvmd_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/clvmd_init_red_hat" ;; "scripts/cmirrord_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/cmirrord_init_red_hat" ;; + "scripts/lvm2_lvmetad_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmetad_systemd_red_hat.service" ;; "scripts/lvm2_monitoring_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_init_red_hat" ;; "scripts/dm_event_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/dm_event_systemd_red_hat.service" ;; "scripts/lvm2_monitoring_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_systemd_red_hat.service" ;; diff --git a/configure.in b/configure.in index 5ab2c55d9..1161c14b7 100644 --- a/configure.in +++ b/configure.in @@ -1528,6 +1528,7 @@ man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat +scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 5a04cb52e..29d1aef87 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -63,6 +63,10 @@ ifeq ("@BUILD_DMEVENTD@", "yes") $(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 endif +ifeq ("@BUILD_LVMETAD@", "yes") + $(INSTALL_DATA) lvm2_lvmetad_systemd_red_hat.socket $(systemd_dir)/lvm2-lvmetad.socket + $(INSTALL_DATA) lvm2_lvmetad_systemd_red_hat.service.in $(systemd_dir)/lvm2-lvmetad.service +endif install_tmpfiles_configuration: $(INSTALL_DIR) $(tmpfiles_dir) diff --git a/scripts/lvm2_lvmetad_systemd_red_hat.service.in b/scripts/lvm2_lvmetad_systemd_red_hat.service.in new file mode 100644 index 000000000..f0f603ed5 --- /dev/null +++ b/scripts/lvm2_lvmetad_systemd_red_hat.service.in @@ -0,0 +1,15 @@ +[Unit] +Description=LVM2 metadata daemon +Requires=lvm2-lvmetad.socket +After=lvm2-lvmetad.socket +DefaultDependencies=no +Conflicts=shutdown.target + +[Service] +Type=forking +ExecStart=@sbindir@/lvmetad +ExecReload=@sbindir@/lvmetad -R +PIDFile=/var/run/lvm/lvmetad.pid + +[Install] +WantedBy=sysinit.target diff --git a/scripts/lvm2_lvmetad_systemd_red_hat.socket b/scripts/lvm2_lvmetad_systemd_red_hat.socket new file mode 100644 index 000000000..a17232b7d --- /dev/null +++ b/scripts/lvm2_lvmetad_systemd_red_hat.socket @@ -0,0 +1,10 @@ +[Unit] +Description=LVM2 metadata daemon socket +DefaultDependencies=no + +[Socket] +ListenStream=/var/run/lvm/lvmetad.socket +SocketMode=0600 + +[Install] +WantedBy=sockets.target -- 2.43.5