summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarian Csontos <mcsontos@redhat.com>2019-06-04 10:18:49 +0200
committerMarian Csontos <mcsontos@redhat.com>2019-06-04 10:18:49 +0200
commit7ee93dfa468ceb1b0981b4eb371ddc7dd64eb978 (patch)
tree7497338cc3ac581255fa9d139c49ea7fb614190c
parent669a834981c0bc808d42dbe5097d7beeead982ad (diff)
downloadlvm2-dev-mcsontos-fix-tests.tar.gz
test: Some old systems do not have /etc/machine-iddev-mcsontos-fix-tests
IMHO it does not add much value running these tests on all the old systems.
-rw-r--r--test/shell/pvscan-autoactivate.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/shell/pvscan-autoactivate.sh b/test/shell/pvscan-autoactivate.sh
index 362a4ff83..2839d577f 100644
--- a/test/shell/pvscan-autoactivate.sh
+++ b/test/shell/pvscan-autoactivate.sh
@@ -132,6 +132,8 @@ ls "$RUNDIR/lvm/pvs_online"
not ls "$RUNDIR/lvm/pvs_online/$PVID3"
+# TODO: check this works on Lenny:
+if [[ -f /etc/machine-id ]]; then
# pvscan cache ignores pv in a foreign vg
aux lvmconf "global/system_id_source = machineid"
@@ -167,7 +169,7 @@ lvs --foreign $vg2 > tmp
cat tmp
grep $lv2 tmp
check lv_field $vg2/$lv2 lv_active "" --foreign
-
+fi
# Test the case where pvscan --cache -aay (with no devs)
# gets the final PV to complete the VG, where that final PV