diff options
| author | Richard Elling <[email protected]> | 2018-08-30 14:43:37 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-08-30 14:43:37 -0700 |
| commit | 6fa1e1e73a50d224e0d768fb2ef1d024df50f086 (patch) | |
| tree | 482582d0514c7d7b32e6c5e1f71f1a6c1b2b7ff3 | |
| parent | de61daa597129b4bc5cba275cf2ce4aa64069ed5 (diff) | |
ZTS: Fix DEV_DSKDIR trim from disk
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Richard Elling <[email protected]>
Closes #7848
| -rw-r--r-- | tests/zfs-tests/include/libtest.shlib | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index 1fdb91bd9..e5a3d63a4 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -2006,7 +2006,7 @@ function check_hotspare_state # pool disk state{inuse,avail} function wait_hotspare_state # pool disk state timeout { typeset pool=$1 - typeset disk=${2#$/DEV_DSKDIR/} + typeset disk=${2#*$DEV_DSKDIR/} typeset state=$3 typeset timeout=${4:-60} typeset -i i=0 @@ -2050,7 +2050,7 @@ function check_slog_state # pool disk state{online,offline,unavail} function check_vdev_state # pool disk state{online,offline,unavail} { typeset pool=$1 - typeset disk=${2#$/DEV_DSKDIR/} + typeset disk=${2#*$DEV_DSKDIR/} typeset state=$3 cur_state=$(get_device_state $pool $disk) @@ -2069,7 +2069,7 @@ function check_vdev_state # pool disk state{online,offline,unavail} function wait_vdev_state # pool disk state timeout { typeset pool=$1 - typeset disk=${2#$/DEV_DSKDIR/} + typeset disk=${2#*$DEV_DSKDIR/} typeset state=$3 typeset timeout=${4:-60} typeset -i i=0 |