From a092cd33be13229b288ab44fb39e410c1ca57175 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Tue, 11 Feb 2014 10:03:19 +0100 Subject: systemd: rename lvm2-cluster-activation and lvm2-clvmd services to follow existing naming lvm2_cluster_activation_red_hat.service.in -> lvm2_cluster_activation_systemd_red_hat.service.in lvm2_clvmd_red_hat.service.in -> lvm2_clvmd_red_hat.service.in Edit lvm2-cluster-activation reference on cmirror - take new lvm2-cmirrord.service, it was just cmirrord(.service) before as the old initscript was used in compatibility mode. Also, use WantedBy=multi-user.target instead of sysinit.target in lvm2-cluster-activation.service. --- scripts/Makefile.in | 9 +++++---- scripts/lvm2_cluster_activation_red_hat.service.in | 16 ---------------- ...m2_cluster_activation_systemd_red_hat.service.in | 16 ++++++++++++++++ scripts/lvm2_clvmd_red_hat.service.in | 21 --------------------- scripts/lvm2_clvmd_systemd_red_hat.service.in | 21 +++++++++++++++++++++ 5 files changed, 42 insertions(+), 41 deletions(-) delete mode 100644 scripts/lvm2_cluster_activation_red_hat.service.in create mode 100644 scripts/lvm2_cluster_activation_systemd_red_hat.service.in delete mode 100644 scripts/lvm2_clvmd_red_hat.service.in create mode 100644 scripts/lvm2_clvmd_systemd_red_hat.service.in (limited to 'scripts') 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_red_hat.service.in deleted file mode 100644 index b6887c398..000000000 --- a/scripts/lvm2_cluster_activation_red_hat.service.in +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Clustered LVM volumes activation service -Requires=lvm2-clvmd.service -After=lvm2-clvmd.service cmirrord.service -OnFailure=lvm2-clvmd.service -DefaultDependencies=false - -[Service] -Type=simple -RemainAfterExit=yes -EnvironmentFile=-@sysconfdir@/sysconfig/clvmd -ExecStart=@systemdutildir@/lvm2-cluster-activation activate -ExecStop=@systemdutildir@/lvm2-cluster-activation deactivate - -[Install] -WantedBy=sysinit.target diff --git a/scripts/lvm2_cluster_activation_systemd_red_hat.service.in b/scripts/lvm2_cluster_activation_systemd_red_hat.service.in new file mode 100644 index 000000000..03ed9d247 --- /dev/null +++ b/scripts/lvm2_cluster_activation_systemd_red_hat.service.in @@ -0,0 +1,16 @@ +[Unit] +Description=Clustered LVM volumes activation service +Requires=lvm2-clvmd.service +After=lvm2-clvmd.service lvm2-cmirrord.service +OnFailure=lvm2-clvmd.service +DefaultDependencies=false + +[Service] +Type=simple +RemainAfterExit=yes +EnvironmentFile=-@sysconfdir@/sysconfig/clvmd +ExecStart=@systemdutildir@/lvm2-cluster-activation activate +ExecStop=@systemdutildir@/lvm2-cluster-activation deactivate + +[Install] +WantedBy=multi-user.target diff --git a/scripts/lvm2_clvmd_red_hat.service.in b/scripts/lvm2_clvmd_red_hat.service.in deleted file mode 100644 index c10bdc48b..000000000 --- a/scripts/lvm2_clvmd_red_hat.service.in +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Clustered LVM daemon -Documentation=man:clvmd(8) -After=dlm.service corosync.service -Before=remote-fs.target -Requires=network.target dlm.service corosync.service -RefuseManualStart=true -RefuseManualStop=true -StopWhenUnneeded=true - -[Service] -Type=forking -Environment=CLVMD_OPTS=-T30 -EnvironmentFile=-@sysconfdir@/sysconfig/clvmd -ExecStart=@sbindir@/clvmd $CLVMD_OPTS -SuccessExitStatus=5 -TimeoutStartSec=30 -TimeoutStopSec=10 -OOMScoreAdjust=-1000 -Restart=on-abort -PIDFile=@CLVMD_PIDFILE@ diff --git a/scripts/lvm2_clvmd_systemd_red_hat.service.in b/scripts/lvm2_clvmd_systemd_red_hat.service.in new file mode 100644 index 000000000..c10bdc48b --- /dev/null +++ b/scripts/lvm2_clvmd_systemd_red_hat.service.in @@ -0,0 +1,21 @@ +[Unit] +Description=Clustered LVM daemon +Documentation=man:clvmd(8) +After=dlm.service corosync.service +Before=remote-fs.target +Requires=network.target dlm.service corosync.service +RefuseManualStart=true +RefuseManualStop=true +StopWhenUnneeded=true + +[Service] +Type=forking +Environment=CLVMD_OPTS=-T30 +EnvironmentFile=-@sysconfdir@/sysconfig/clvmd +ExecStart=@sbindir@/clvmd $CLVMD_OPTS +SuccessExitStatus=5 +TimeoutStartSec=30 +TimeoutStopSec=10 +OOMScoreAdjust=-1000 +Restart=on-abort +PIDFile=@CLVMD_PIDFILE@ -- cgit v1.2.1