summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.in9
-rw-r--r--scripts/lvm2_cluster_activation_systemd_red_hat.service.in (renamed from scripts/lvm2_cluster_activation_red_hat.service.in)4
-rw-r--r--scripts/lvm2_clvmd_systemd_red_hat.service.in (renamed from scripts/lvm2_clvmd_red_hat.service.in)0
3 files changed, 7 insertions, 6 deletions
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 35e20c517..8fdb5f716 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -112,8 +112,8 @@ ifeq ("@BUILD_LVMETAD@", "yes")
$(INSTALL_DATA) lvm2_pvscan_systemd_red_hat@.service $(systemd_unit_dir)/lvm2-pvscan@.service
endif
ifneq ("@CLVMD@", "none")
- $(INSTALL_DATA) lvm2_clvmd_red_hat.service $(systemd_unit_dir)/lvm2-clvmd.service
- $(INSTALL_DATA) lvm2_cluster_activation_red_hat.service $(systemd_unit_dir)/lvm2-cluster-activation.service
+ $(INSTALL_DATA) lvm2_clvmd_systemd_red_hat.service $(systemd_unit_dir)/lvm2-clvmd.service
+ $(INSTALL_DATA) lvm2_cluster_activation_systemd_red_hat.service $(systemd_unit_dir)/lvm2-cluster-activation.service
$(INSTALL_DATA) lvm2_cluster_activation_red_hat.sh $(systemd_dir)/lvm2-cluster-activation
endif
ifeq ("@BUILD_CMIRRORD@", "yes")
@@ -132,6 +132,7 @@ DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat \
lvm2_pvscan_systemd_red_hat@.service \
lvm2_tmpfiles_red_hat.conf blk_availability_init_red_hat \
blk_availability_systemd_red_hat.service \
- blkdeactivate.sh lvm2_clvmd_red_hat.service \
+ blkdeactivate.sh lvm2_clvmd_systemd_red_hat.service \
lvm2_cmirrord_systemd_red_hat.service \
- lvm2_cluster_activation_red_hat.service lvm2_cluster_activation_red_hat.sh
+ lvm2_cluster_activation_systemd_red_hat.service \
+ lvm2_cluster_activation_red_hat.sh
diff --git a/scripts/lvm2_cluster_activation_red_hat.service.in b/scripts/lvm2_cluster_activation_systemd_red_hat.service.in
index b6887c398..03ed9d247 100644
--- a/scripts/lvm2_cluster_activation_red_hat.service.in
+++ b/scripts/lvm2_cluster_activation_systemd_red_hat.service.in
@@ -1,7 +1,7 @@
[Unit]
Description=Clustered LVM volumes activation service
Requires=lvm2-clvmd.service
-After=lvm2-clvmd.service cmirrord.service
+After=lvm2-clvmd.service lvm2-cmirrord.service
OnFailure=lvm2-clvmd.service
DefaultDependencies=false
@@ -13,4 +13,4 @@ ExecStart=@systemdutildir@/lvm2-cluster-activation activate
ExecStop=@systemdutildir@/lvm2-cluster-activation deactivate
[Install]
-WantedBy=sysinit.target
+WantedBy=multi-user.target
diff --git a/scripts/lvm2_clvmd_red_hat.service.in b/scripts/lvm2_clvmd_systemd_red_hat.service.in
index c10bdc48b..c10bdc48b 100644
--- a/scripts/lvm2_clvmd_red_hat.service.in
+++ b/scripts/lvm2_clvmd_systemd_red_hat.service.in