summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2014-02-07 10:54:11 -0800
committerBrian Behlendorf <[email protected]>2014-02-10 15:48:32 -0800
commit0820ec65c4027b878894776a0fbbeac271e87803 (patch)
treecd4e20fe1f92d687a09e061d3c93eb28f8c87729 /scripts
parent881f45c6a8f44486f76c4713ecef0d533d6601e8 (diff)
Fix zconfig.sh test 9
Commit ba6a240 adjusted the behavior of 'zfs create -V'. The caller is no longer guaranteed that udev will have finished creating the /dev/ entries by the time to command exits. It is therefore required that we explicitly block waiting for udev to settle for this test to run reliably. Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/zconfig.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh
index 622bb28f1..d6695be72 100755
--- a/scripts/zconfig.sh
+++ b/scripts/zconfig.sh
@@ -554,6 +554,7 @@ test_9() {
${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
${ZFS} create -V 300M ${FULL_NAME} || fail 3
+ udev_trigger
# Dump the events, there should be at least 5 lines.
${ZPOOL} events >${TMP_EVENTS} || fail 4