From 101ce82afa30bbd6710ac50718c1bc55c9c01b94 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Tue, 28 Jun 2011 00:38:26 +0000
Subject: [PATCH] Change to still sync with udev (to test waiting for rules)
 then to verify udev operations like it used to (which will perform them on
 systems with non-std dev dirs where test udev rules aren't installed).

---
 test/lib/aux.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index c94b90e5e..878700dc6 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -314,9 +314,9 @@ prepare_vg() {
 lvmconf() {
     if test -z "$LVM_TEST_LOCKING"; then LVM_TEST_LOCKING=1; fi
     if test "$DM_DEV_DIR" = "/dev"; then
-	UDEV_RULES=1;
+	VERIFY_UDEV=0;
     else
-	UDEV_RULES=0;
+	VERIFY_UDEV=1;
     fi
     test -f CONFIG_VALUES || {
         cat > CONFIG_VALUES <<-EOF
@@ -341,7 +341,8 @@ global/locking_type=$LVM_TEST_LOCKING
 global/si_unit_consistency = 1
 global/fallback_to_local_locking = 0
 activation/udev_sync = 1
-activation/udev_rules = $UDEV_RULES
+activation/udev_rules = 1
+activation/verify_udev_operations = $VERIFY_UDEV
 activation/polling_interval = 0
 activation/snapshot_autoextend_percent = 50
 activation/snapshot_autoextend_threshold = 50