X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fcommon.sh.in;h=531c7983b4f9334ca646cab00f4dd0166627357b;hb=930b6fec210d828cb3755f8756dbbbf3001cccae;hp=71a6b18a06f7401cefc2a57353a4253e66a4e63b;hpb=93648f314c258897a0fa72b0d0b164e1937a5b63;p=zfs.git diff --git a/scripts/common.sh.in b/scripts/common.sh.in index 71a6b18..531c798 100644 --- a/scripts/common.sh.in +++ b/scripts/common.sh.in @@ -116,6 +116,27 @@ skip() { echo -e "${COLOR_BROWN}Skip${COLOR_RESET}" } +populate() { + local ROOT=$1 + local MAX_DIR_SIZE=$2 + local MAX_FILE_SIZE=$3 + + mkdir -p $ROOT/{a,b,c,d,e,f,g}/{h,i} + DIRS=`find $ROOT` + + for DIR in $DIRS; do + COUNT=$(($RANDOM % $MAX_DIR_SIZE)) + + for i in `seq $COUNT`; do + FILE=`mktemp -p ${DIR}` + SIZE=$(($RANDOM % $MAX_FILE_SIZE)) + dd if=/dev/urandom of=$FILE bs=1k count=$SIZE &>/dev/null + done + done + + return 0 +} + init() { # Disable the udev rule 90-zfs.rules to prevent the zfs module # stack from being loaded due to the detection of a zfs device. @@ -124,9 +145,15 @@ init() { # set to ensure the udev rule is correctly replaced on exit. local RULE=${udevruledir}/90-zfs.rules if test -e ${RULE}; then - trap "mv ${RULE}.disabled ${RULE}; exit $?" INT TERM EXIT + trap "mv ${RULE}.disabled ${RULE}" INT TERM EXIT mv ${RULE} ${RULE}.disabled fi + + # Create a random directory tree of files and sub-directories to + # to act as a copy source for the various regression tests. + SRC_DIR=`mktemp -d -p /var/tmp/ zfs.src.XXXXXXXX` + trap "rm -Rf $SRC_DIR" INT TERM EXIT + populate $SRC_DIR 10 100 } spl_dump_log() { @@ -263,7 +290,7 @@ check_loop_utils() { # Find and return an unused loopback device. # unused_loop_device() { - for DEVICE in `ls -1 /dev/loop* 2>/dev/null`; do + for DEVICE in `ls -1 /dev/loop[0-9]* 2>/dev/null`; do ${LOSETUP} ${DEVICE} &>/dev/null if [ $? -ne 0 ]; then echo ${DEVICE} @@ -342,7 +369,9 @@ format() { local DEVICE=$1 local FSTYPE=$2 - /sbin/mkfs.${FSTYPE} -q ${DEVICE} || return 1 + # Force 4K blocksize, else mkfs.ext2 tries to use 8K, which + # won't mount + /sbin/mkfs.${FSTYPE} -b 4096 -F -q ${DEVICE} || return 1 return 0 }