From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 25 Jul 2014 16:49:30 +0000 (+0000)
Subject: - visual cosmetics, use run_cmd, eval vgs
X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=commitdiff_plain;h=27ad7c289107f954a59f327174f9cfdbb09c5386

- visual cosmetics, use run_cmd, eval vgs
---

diff --git a/lvm2-tld_init.patch b/lvm2-tld_init.patch
index 6c6c82d..176e185 100644
--- a/lvm2-tld_init.patch
+++ b/lvm2-tld_init.patch
@@ -118,7 +118,7 @@ diff -dur LVM2.2.02.107.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.107/scripts
  	if  [ $? != 0 ]; then
 diff -dur LVM2.2.02.107.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.107/scripts/lvm2_monitoring_init_red_hat.in
 --- LVM2.2.02.107.orig/scripts/lvm2_monitoring_init_red_hat.in	2014-06-23 14:07:38.000000000 +0000
-+++ LVM2.2.02.107/scripts/lvm2_monitoring_init_red_hat.in	2014-07-25 16:29:30.757000000 +0000
++++ LVM2.2.02.107/scripts/lvm2_monitoring_init_red_hat.in	2014-07-25 16:46:56.772000000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -133,11 +133,11 @@ diff -dur LVM2.2.02.107.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.1
 +	local config="'log{command_names=0 prefix=\"  \"}'"
  	# TODO do we want to separate out already active groups only?
 -	VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config 'log{command_names=0 prefix="  "}' 2> /dev/null`
-+	VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config $config 2> /dev/null`
++	VGSLIST=`eval $VGS --noheadings -o name --ignoreskippedcluster --config $config 2> /dev/null`
  	for vg in $VGSLIST
  	do
 -	    action "Starting monitoring for VG $vg:" $VGCHANGE --monitor y --poll y --ignoreskippedcluster --config 'log{command_names=0 prefix="  "}' $vg || ret=$?
-+	    run_cmd "Starting monitoring for VG $vg" $VGCHANGE --monitor y --poll y --ignoreskippedcluster --config $config $vg
++	    run_cmd "Starting monitoring for LVM VG $vg" $VGCHANGE --monitor y --poll y --ignoreskippedcluster --config $config $vg
  	done
 -
 -	return $ret
@@ -154,11 +154,11 @@ diff -dur LVM2.2.02.107.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.1
  	   return 1
  	fi
 -	VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config 'log{command_names=0 prefix="  "}' 2> /dev/null`
-+	VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config ${config} 2> /dev/null`
++	VGSLIST=`eval $VGS --noheadings -o name --ignoreskippedcluster --config ${config} 2> /dev/null`
  	for vg in $VGSLIST
  	do
 -	    action "Stopping monitoring for VG $vg:" $VGCHANGE --monitor n --ignoreskippedcluster --config 'log{command_names=0 prefix="  "}' $vg || ret=$?
-+	    run_cmd "Stopping monitoring for VG $vg" $VGCHANGE --monitor n --ignoreskippedcluster --config $config $vg
++	    run_cmd "Stopping monitoring for LVM VG $vg" $VGCHANGE --monitor n --ignoreskippedcluster --config $config $vg
  	done
 -	return $ret
  }