49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
|
commit 8dedeaa0183d2c87764a4012e443af9597d28575
|
||
|
|
Author: Peter Rajnoha <prajnoha@redhat.com>
|
||
|
|
Date: Wed Oct 31 14:15:54 2012 +0100
|
||
|
|
|
||
|
|
0
|
||
|
|
---
|
||
|
|
WHATS_NEW | 3 +++
|
||
|
|
scripts/lvm2_monitoring_systemd_red_hat.service.in | 7 ++++---
|
||
|
|
2 files changed, 7 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/WHATS_NEW b/WHATS_NEW
|
||
|
|
index d0e0cd4..12307ed 100644
|
||
|
|
--- a/WHATS_NEW
|
||
|
|
+++ b/WHATS_NEW
|
||
|
|
@@ -1,5 +1,8 @@
|
||
|
|
Version 2.02.99 -
|
||
|
|
===================================
|
||
|
|
+ Don't use lvmetad in lvm2-monitor.service ExecStop to avoid a systemd issue.
|
||
|
|
+ Remove dependency on fedora-storage-init.service in lvm2 systemd units.
|
||
|
|
+ Depend on lvm2-lvmetad.socket in lvm2-monitor.service systemd unit.
|
||
|
|
Initialize lvmetad lazily to avoid early socket access on config overrides.
|
||
|
|
Hardcode use_lvmetad=0 if cluster locking used and issue a warning msg.
|
||
|
|
|
||
|
|
diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
|
||
|
|
index 6c4c55f..e6b4814 100644
|
||
|
|
--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
|
||
|
|
+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
|
||
|
|
@@ -1,8 +1,8 @@
|
||
|
|
[Unit]
|
||
|
|
Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
|
||
|
|
Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
|
||
|
|
-Requires=dm-event.socket
|
||
|
|
-After=dm-event.socket fedora-storage-init.service fedora-storage-init-late.service lvm2-activation.service lvm2-lvmetad.service
|
||
|
|
+Requires=dm-event.socket lvm2-lvmetad.socket
|
||
|
|
+After=dm-event.socket lvm2-lvmetad.socket lvm2-lvmetad.service
|
||
|
|
Before=local-fs.target
|
||
|
|
DefaultDependencies=no
|
||
|
|
Conflicts=shutdown.target
|
||
|
|
@@ -11,7 +11,8 @@ Conflicts=shutdown.target
|
||
|
|
Type=oneshot
|
||
|
|
Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
|
||
|
|
ExecStart=@sbindir@/lvm vgchange --monitor y
|
||
|
|
-ExecStop=@sbindir@/lvm vgchange --monitor n
|
||
|
|
+# The lvmetad must be disabled here, it needs https://bugzilla.redhat.com/show_bug.cgi?id=843587 to be resolved first.
|
||
|
|
+ExecStop="@sbindir@/lvm vgchange --monitor n --config 'global{use_lvmetad=0}'"
|
||
|
|
RemainAfterExit=yes
|
||
|
|
|
||
|
|
[Install]
|