X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fzconfig.sh;h=3d965bbca9d7784b99f0354797fe6908db52c607;hb=1e411a4c12b95b1a18028585ae7fd5e51030b25e;hp=c2e5d9754007264e85f7ac2633d203bb5b627674;hpb=325f023544bbec6a478882c442e15304ee379759;p=zfs.git

diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh
index c2e5d97..3d965bb 100755
--- a/scripts/zconfig.sh
+++ b/scripts/zconfig.sh
@@ -148,7 +148,7 @@ zconfig_zvol_device_stat() {
 	local COUNT=0
 
 	# Briefly delay for udev
-	sleep 1
+	sleep 3
 
 	# Pool exists
 	stat ${POOL_NAME} &>/dev/null   && let COUNT=$COUNT+1
@@ -348,7 +348,8 @@ test_6() {
 	mount /dev/${FULL_ZVOL_NAME}1 /tmp/${ZVOL_NAME}1 || fail 7
 
 	# Snapshot the pristine ext2 filesystem and mount it read-only.
-	${ZFS} snapshot ${FULL_SNAP_NAME} && sleep 1 || fail 8
+	${ZFS} snapshot ${FULL_SNAP_NAME} || fail 8
+	wait_udev /dev/${FULL_SNAP_NAME}1 30 || fail 8
 	mkdir -p /tmp/${SNAP_NAME}1 || fail 9
 	mount /dev/${FULL_SNAP_NAME}1 /tmp/${SNAP_NAME}1 &>/dev/null || fail 10
 
@@ -393,11 +394,11 @@ test_7() {
 	# Create a pool and volume.
 	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
 	${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
-	${ZFS} create -V 400M ${FULL_ZVOL_NAME} || fail 3
+	${ZFS} create -V 300M ${FULL_ZVOL_NAME} || fail 3
 
-	# Partition the volume, for a 400M volume there will be
-	# 812 cylinders, 16 heads, and 63 sectors per track.
-	zconfig_partition /dev/${FULL_ZVOL_NAME} 0 812
+	# Partition the volume, for a 300M volume there will be
+	# 609 cylinders, 16 heads, and 63 sectors per track.
+	zconfig_partition /dev/${FULL_ZVOL_NAME} 0 609
 
 	# Format the partition with ext2 (no journal).
 	/sbin/mkfs.ext2 -q /dev/${FULL_ZVOL_NAME}1 || fail 5
@@ -407,7 +408,8 @@ test_7() {
 	mount /dev/${FULL_ZVOL_NAME}1 /tmp/${ZVOL_NAME}1 || fail 7
 
 	# Snapshot the pristine ext2 filesystem and mount it read-only.
-	${ZFS} snapshot ${FULL_SNAP_NAME} && sleep 1 || fail 8
+	${ZFS} snapshot ${FULL_SNAP_NAME} || fail 8
+	wait_udev /dev/${FULL_SNAP_NAME}1 30 || fail 8
 	mkdir -p /tmp/${SNAP_NAME}1 || fail 9
 	mount /dev/${FULL_SNAP_NAME}1 /tmp/${SNAP_NAME}1 &>/dev/null || fail 10
 
@@ -421,7 +423,8 @@ test_7() {
 	diff -ur ${SRC_DIR} /tmp/${SNAP_NAME}1${SRC_DIR} &>/dev/null && fail 13
 
 	# Clone from the original pristine snapshot
-	${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} && sleep 1 || fail 14
+	${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 14
+	wait_udev /dev/${FULL_CLONE_NAME}1 30 || fail 14
 	mkdir -p /tmp/${CLONE_NAME}1 || fail 15
 	mount /dev/${FULL_CLONE_NAME}1 /tmp/${CLONE_NAME}1 || fail 16
 
@@ -475,11 +478,11 @@ test_8() {
 	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
 	${ZPOOL_CREATE_SH} -p ${POOL_NAME1} -c lo-raidz2 || fail 2
 	${ZPOOL_CREATE_SH} -p ${POOL_NAME2} -c lo-raidz2 || fail 3
-	${ZFS} create -V 400M ${FULL_ZVOL_NAME1} || fail 4
+	${ZFS} create -V 300M ${FULL_ZVOL_NAME1} || fail 4
 
-	# Partition the volume, for a 400M volume there will be
-	# 812 cylinders, 16 heads, and 63 sectors per track.
-	zconfig_partition /dev/${FULL_ZVOL_NAME1} 0 812
+	# Partition the volume, for a 300M volume there will be
+	# 609 cylinders, 16 heads, and 63 sectors per track.
+	zconfig_partition /dev/${FULL_ZVOL_NAME1} 0 609
 
 	# Format the partition with ext2.
 	/sbin/mkfs.ext2 -q /dev/${FULL_ZVOL_NAME1}1 || fail 5
@@ -491,11 +494,13 @@ test_8() {
 	sync || fail 9
 
 	# Snapshot the ext3 filesystem so it may be sent.
-	${ZFS} snapshot ${FULL_SNAP_NAME1} && sleep 1 || fail 11
+	${ZFS} snapshot ${FULL_SNAP_NAME1} || fail 11
+	wait_udev /dev/${FULL_SNAP_NAME1} 30 || fail 11
 
 	# Send/receive the snapshot from POOL_NAME1 to POOL_NAME2
 	(${ZFS} send ${FULL_SNAP_NAME1} | \
-	${ZFS} receive ${FULL_ZVOL_NAME2}) && sleep 1 || fail 12
+	${ZFS} receive ${FULL_ZVOL_NAME2}) || fail 12
+	wait_udev /dev/${FULL_ZVOL_NAME2}1 30 || fail 12
 
 	# Mount the sent ext3 filesystem.
 	mkdir -p /tmp/${FULL_ZVOL_NAME2}1 || fail 13
@@ -537,7 +542,7 @@ test_9() {
 	# Create a pool and volume.
 	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
 	${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
-	${ZFS} create -V 400M ${FULL_NAME} || fail 3
+	${ZFS} create -V 300M ${FULL_NAME} || fail 3
 
 	# Dump the events, there should be at least 5 lines.
 	${ZPOOL} events >${TMP_EVENTS} || fail 4