c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-24 03:08:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Fix a few defaults

Browse Source 
Linux was missing a default value for DEV_DSKDIR. Set it to /dev.
Fix resulting fallout.

SLICE_PREFIX seems like a good candidate for including in the defaults.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #9898
This commit is contained in:
Ryan Moeller
2020-01-31 11:51:23 -05:00
committed by GitHub
parent 9d8ce2457d
commit a3bddd49f8
14 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/include/blkdev.shlib
+2 -5
View File
@@ -89,8 +89,8 @@ function block_device_wait
#
function is_physical_device #device
{
typeset device=${1#$DEV_DSKDIR}
device=${device#$DEV_RDSKDIR}
typeset device=${1#$DEV_DSKDIR/}
device=${device#$DEV_RDSKDIR/}
if is_linux; then
is_disk_device "$DEV_DSKDIR/$device" && \
@@ -216,9 +216,6 @@ function set_slice_prefix
fi
(( i = i + 1))
done
elif is_freebsd; then
export SLICE_PREFIX="p"
return 0
fi
}