Fix clvmd init script status

- s/Active clustred VG/clustered VG/ (only LV can be active)

- print only active LVs (not all) in status command
(In the lvdisplay form /dev/vg/lv.)

For now, still use awk (already used in clustered_vgs).

https://bugzilla.redhat.com/show_bug.cgi?id=598495

diff --git a/WHATS_NEW b/WHATS_NEW
index 46dd4099c726173842f39860bb596b9343caa484..7dbf4095da01e6b6fef3c308bb666f453ef29959 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.68 -
 ===============================
+  Fix clvmd initscript status to print only active clustered LVs.
   Fix typo "INTERNAL ERROR" -> "INTERNAL_ERROR" in libdm-iface.c.
   Add lv_path to reports to offer full /dev pathname.
   Fix typo in warning message about missing device with allocated data areas.

diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in
index 1a03984c88e9c9407a5e1462b1fdbf5e0969ec11..da09a3453ade8a4b188597885bed0fb47a6690bc 100644 (file)
--- a/scripts/clvmd_init_red_hat.in
+++ b/scripts/clvmd_init_red_hat.in
@@ -25,7 +25,7 @@ sbindir=@sbindir@
 lvm_vgchange=${sbindir}/vgchange
 lvm_vgdisplay=${sbindir}/vgdisplay
 lvm_vgscan=${sbindir}/vgscan
-lvm_lvs=${sbindir}/lvs
+lvm_lvdisplay=${sbindir}/lvdisplay
 
 CLVMDOPTS="-T30"
 
@@ -47,9 +47,10 @@ clustered_vgs() {
                awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'
 }
 
-clustered_lvs() {
+clustered_active_lvs() {
        for i in $(clustered_vgs); do
-               ${lvm_lvs} -o lv_name --noheadings $i
+               ${lvm_lvdisplay} $i 2>/dev/null | \
+               awk 'BEGIN {RS="LV Name"} {if (/[^N^O^T] available/) print $1;}'
        done
 }
 
@@ -197,8 +198,8 @@ case "$1" in
        rtrn=$?
        if [ $rtrn = 0 ]; then
                cvgs="$(clustered_vgs)"
-               echo Active clustered Volume Groups: ${cvgs:-"(none)"}
-               clvs="$(clustered_lvs)"
+               echo Clustered Volume Groups: ${cvgs:-"(none)"}
+               clvs="$(clustered_active_lvs)"
                echo Active clustered Logical Volumes: ${clvs:-"(none)"}
        fi
        ;;