Blame SOURCES/lvm2-2_03_06-tests-lvm-on-md-use-variable-run-dir.patch
|
 |
26e710 |
test/shell/lvm-on-md.sh | 13 +++++++------
|
|
|
26e710 |
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
26e710 |
|
|
|
26e710 |
diff --git a/test/shell/lvm-on-md.sh b/test/shell/lvm-on-md.sh
|
|
|
26e710 |
index c848083..2877ea2 100644
|
|
|
26e710 |
--- a/test/shell/lvm-on-md.sh
|
|
|
26e710 |
+++ b/test/shell/lvm-on-md.sh
|
|
|
26e710 |
@@ -16,6 +16,7 @@ RUNDIR="/run"
|
|
|
26e710 |
test -d "$RUNDIR" || RUNDIR="/var/run"
|
|
|
26e710 |
PVS_ONLINE_DIR="$RUNDIR/lvm/pvs_online"
|
|
|
26e710 |
VGS_ONLINE_DIR="$RUNDIR/lvm/vgs_online"
|
|
|
26e710 |
+HINTS="$RUNDIR/lvm/hints"
|
|
|
26e710 |
|
|
|
26e710 |
_clear_online_files() {
|
|
|
26e710 |
# wait till udev is finished
|
|
|
26e710 |
@@ -330,10 +331,10 @@ pvs > out
|
|
|
26e710 |
not grep "$dev1" out
|
|
|
26e710 |
not grep "$dev2" out
|
|
|
26e710 |
|
|
|
26e710 |
-grep "$mddev" /run/lvm/hints
|
|
|
26e710 |
-grep "$dev3" /run/lvm/hints
|
|
|
26e710 |
-not grep "$dev1" /run/lvm/hints
|
|
|
26e710 |
-not grep "$dev2" /run/lvm/hints
|
|
|
26e710 |
+grep "$mddev" $HINTS
|
|
|
26e710 |
+grep "$dev3" $HINTS
|
|
|
26e710 |
+not grep "$dev1" $HINTS
|
|
|
26e710 |
+not grep "$dev2" $HINTS
|
|
|
26e710 |
|
|
|
26e710 |
sleep 1
|
|
|
26e710 |
|
|
|
26e710 |
@@ -363,7 +364,7 @@ not grep "$mddev" out2
|
|
|
26e710 |
not grep "$dev1" out2
|
|
|
26e710 |
not grep "$dev2" out2
|
|
|
26e710 |
grep "$dev3" out2
|
|
|
26e710 |
-cat /run/lvm/hints
|
|
|
26e710 |
+cat $HINTS
|
|
|
26e710 |
|
|
|
26e710 |
pvs 2>&1|tee out1
|
|
|
26e710 |
grep -v WARNING out1 > out2
|
|
|
26e710 |
@@ -372,7 +373,7 @@ not grep "$mddev" out2
|
|
|
26e710 |
not grep "$dev1" out2
|
|
|
26e710 |
not grep "$dev2" out2
|
|
|
26e710 |
grep "$dev3" out2
|
|
|
26e710 |
-cat /run/lvm/hints
|
|
|
26e710 |
+cat $HINTS
|
|
|
26e710 |
|
|
|
26e710 |
# The md components should still be detected and excluded.
|
|
|
26e710 |
not pvs "$dev1"
|