diff options
| author | Ryan Moeller <[email protected]> | 2020-01-31 11:51:23 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-01-31 08:51:23 -0800 |
| commit | a3bddd49f8397b3e10872a793d60c8bbbdbe2a80 (patch) | |
| tree | a354b56374aeb3fe7121e856485869e7fed9aaca /tests/zfs-tests/include/blkdev.shlib | |
| parent | 9d8ce2457d67e112552ac20b9408464bc246b727 (diff) | |
ZTS: Fix a few defaults
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 <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #9898
Diffstat (limited to 'tests/zfs-tests/include/blkdev.shlib')
| -rw-r--r-- | tests/zfs-tests/include/blkdev.shlib | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/zfs-tests/include/blkdev.shlib b/tests/zfs-tests/include/blkdev.shlib index 5a750bf1b..2269131a4 100644 --- a/tests/zfs-tests/include/blkdev.shlib +++ b/tests/zfs-tests/include/blkdev.shlib @@ -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 } |