summaryrefslogtreecommitdiffstats
path: root/scripts/zfs.sh
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-09-10 21:44:17 -0700
committerBrian Behlendorf <[email protected]>2010-09-11 20:54:41 -0700
commit2c4834f87af4beec4b16157622c85d2850cce25f (patch)
treefd389b2c63285dd28249b23fe63d054ec884938e /scripts/zfs.sh
parentac063c48ae12061bbe0f66b3a9d641239782ae62 (diff)
Wait up to timeout seconds for udev devicezfs-0.5.1
Occasional failures were observed in zconfig.sh because udev could be delayed for a few seconds. To handle this the wait_udev function has been added to wait for timeout seconds for an expected device before returning an error. By default callers currently use a 30 seconds timeout which should be much longer than udev ever needs but not so long to worry the test suite is hung.
Diffstat (limited to 'scripts/zfs.sh')
-rwxr-xr-xscripts/zfs.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/zfs.sh b/scripts/zfs.sh
index 523fbfcc0..6060fbaa8 100755
--- a/scripts/zfs.sh
+++ b/scripts/zfs.sh
@@ -69,6 +69,7 @@ if [ ${UNLOAD} ]; then
else
check_modules || die "${ERROR}"
load_modules "$@"
+ wait_udev /dev/zfs 30
fi
exit 0