Suppress locking error messages in monitoring init scripts.

diff --git a/WHATS_NEW b/WHATS_NEW
index 9c53e390cadc5ad449be30a8b3df55d4d04e38ef..ef88c0ed0652e57a62b99082df928f430b7f5f3b 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.87 - 
 ===============================
+  Suppress locking error messages in monitoring init scripts.
   If pipe in clvmd fails, return busy instead of using uninitialised descriptors.
   Add dmeventd monitoring shared library for RAID.
   Add RAID metadata devices to considered devices in _add_lv_to_dtree.

diff --git a/lib/locking/locking.c b/lib/locking/locking.c
index 79a6d563d615482f089006bbee86dd26d3d4312f..ec8c083880f8911c58c6da84a8846d17874facea 100644 (file)
--- a/lib/locking/locking.c
+++ b/lib/locking/locking.c
@@ -221,7 +221,7 @@ static void _update_vg_lock_count(const char *resource, uint32_t flags)
  */
 int init_locking(int type, struct cmd_context *cmd, int suppress_messages)
 {
-       if (ignorelockingfailure() && getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES"))
+       if (getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES"))
                suppress_messages = 1;
 
        if (type < 0)

diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in
index 4812c750fefd8aa0e63c76eedc2b5b5dcd50a71f..0988511fbcb7788ffd616e1c20a8995746f09d90 100644 (file)
--- a/scripts/lvm2_monitoring_init_red_hat.in
+++ b/scripts/lvm2_monitoring_init_red_hat.in
@@ -42,6 +42,7 @@ VGS=${sbindir}/vgs
 LOCK_FILE="/var/lock/subsys/$DAEMON"
 
 WARN=1
+export LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
 
 start()
 {

diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
index 47154169ff0e498afe09eb82be095984feca46ad..b5dd9bb4eddc511fe5ad84f6700057adc3685cca 100644 (file)
--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
@@ -8,6 +8,7 @@ Conflicts=shutdown.target
 
 [Service]
 Type=oneshot
+Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
 ExecStart=@sbindir@/lvm vgchange --monitor y
 ExecStop=@sbindir@/lvm vgchange --monitor n
 RemainAfterExit=yes