Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Remove /zvol/ path component from zconfig.sh 

See previous commit for details.  But the gist is with the removal of
the zvol path component the regression tests must be updated to use
the correct path name.
This commit is contained in:
Brian Behlendorf 2010-08-09 11:14:09 -07:00
parent 9e3e35dc3f
commit 6478a7f847
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/zconfig.sh
View File

@ -154,14 +154,14 @@ zconfig_test3() {
# Partition the volume, for a 400M volume there will be # Partition the volume, for a 400M volume there will be
# 812 cylinders, 16 heads, and 63 sectors per track. # 812 cylinders, 16 heads, and 63 sectors per track.
zconfig_partition /dev/zvol/${FULL_NAME} 0 812 zconfig_partition /dev/${FULL_NAME} 0 812
# Format the partition with ext3. # Format the partition with ext3.
/sbin/mkfs.ext3 -q /dev/zvol/${FULL_NAME}1 || fail 5 /sbin/mkfs.ext3 -q /dev/${FULL_NAME}1 || fail 5
# Mount the ext3 filesystem and copy some data to it. # Mount the ext3 filesystem and copy some data to it.
mkdir -p /tmp/${ZVOL_NAME} || fail 6 mkdir -p /tmp/${ZVOL_NAME} || fail 6
mount /dev/zvol/${FULL_NAME}1 /tmp/${ZVOL_NAME} || fail 7 mount /dev/${FULL_NAME}1 /tmp/${ZVOL_NAME} || fail 7
cp -RL ${SRC_DIR} /tmp/${ZVOL_NAME} || fail 8 cp -RL ${SRC_DIR} /tmp/${ZVOL_NAME} || fail 8
# Verify the copied files match the original files. # Verify the copied files match the original files.
@ -180,10 +180,10 @@ zconfig_test3
zconfig_zvol_device_stat() { zconfig_zvol_device_stat() {
local EXPECT=$1 local EXPECT=$1
local POOL_NAME=/dev/zvol/$2 local POOL_NAME=/dev/$2
local ZVOL_NAME=/dev/zvol/$3 local ZVOL_NAME=/dev/$3
local SNAP_NAME=/dev/zvol/$4 local SNAP_NAME=/dev/$4
local CLONE_NAME=/dev/zvol/$5 local CLONE_NAME=/dev/$5
local COUNT=0 local COUNT=0
# Pool exists # Pool exists
@ -216,7 +216,7 @@ zconfig_zvol_device_stat() {
zconfig_test4() { zconfig_test4() {
local POOL_NAME=tank local POOL_NAME=tank
local ZVOL_NAME=volume local ZVOL_NAME=volume
local SNAP_NAME=snapshot local SNAP_NAME=snap
local CLONE_NAME=clone local CLONE_NAME=clone
local FULL_ZVOL_NAME=${POOL_NAME}/${ZVOL_NAME} local FULL_ZVOL_NAME=${POOL_NAME}/${ZVOL_NAME}
local FULL_SNAP_NAME=${POOL_NAME}/${ZVOL_NAME}@${SNAP_NAME} local FULL_SNAP_NAME=${POOL_NAME}/${ZVOL_NAME}@${SNAP_NAME}
@ -229,7 +229,7 @@ zconfig_test4() {
${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1 ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
${ZFS} create -V 100M ${FULL_ZVOL_NAME} || fail 3 ${ZFS} create -V 100M ${FULL_ZVOL_NAME} || fail 3
zconfig_partition /dev/zvol/${FULL_ZVOL_NAME} 0 64 || fail 4 zconfig_partition /dev/${FULL_ZVOL_NAME} 0 64 || fail 4
${ZFS} snapshot ${FULL_SNAP_NAME} || fail 5 ${ZFS} snapshot ${FULL_SNAP_NAME} || fail 5
${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 6 ${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 6
@ -268,7 +268,7 @@ zconfig_test4
zconfig_test5() { zconfig_test5() {
POOL_NAME=tank POOL_NAME=tank
ZVOL_NAME=volume ZVOL_NAME=volume
SNAP_NAME=snapshot SNAP_NAME=snap
CLONE_NAME=clone CLONE_NAME=clone
FULL_ZVOL_NAME=${POOL_NAME}/${ZVOL_NAME} FULL_ZVOL_NAME=${POOL_NAME}/${ZVOL_NAME}
FULL_SNAP_NAME=${POOL_NAME}/${ZVOL_NAME}@${SNAP_NAME} FULL_SNAP_NAME=${POOL_NAME}/${ZVOL_NAME}@${SNAP_NAME}
@ -281,7 +281,7 @@ zconfig_test5() {
${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1 ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
${ZFS} create -V 100M ${FULL_ZVOL_NAME} || fail 3 ${ZFS} create -V 100M ${FULL_ZVOL_NAME} || fail 3
zconfig_partition /dev/zvol/${FULL_ZVOL_NAME} 0 64 || fail 4 zconfig_partition /dev/${FULL_ZVOL_NAME} 0 64 || fail 4
${ZFS} snapshot ${FULL_SNAP_NAME} || fail 5 ${ZFS} snapshot ${FULL_SNAP_NAME} || fail 5
${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 6 ${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 6