diff options
author | ngie <ngie@FreeBSD.org> | 2014-10-25 04:52:48 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2014-10-25 04:52:48 +0000 |
commit | d60f1a33ea231eca1ce6cc49dc2cee6abc660d96 (patch) | |
tree | 6dc2dd5c8cc156f7920a7a29c28363b036985dfd /tools | |
parent | 3c5ed8a35e05fcb26f7df0d503c4861723b18647 (diff) | |
download | FreeBSD-src-d60f1a33ea231eca1ce6cc49dc2cee6abc660d96.zip FreeBSD-src-d60f1a33ea231eca1ce6cc49dc2cee6abc660d96.tar.gz |
- Print out "Bail out!" in die(..) so prove terminates immediately
- Handle the output from newer versions of openssl md5, similar to what
pjd@ did in r248304
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/regression/zfs/misc.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/regression/zfs/misc.sh b/tools/regression/zfs/misc.sh index d96aa22..9f6b403 100755 --- a/tools/regression/zfs/misc.sh +++ b/tools/regression/zfs/misc.sh @@ -39,6 +39,7 @@ fi die() { echo "${1}" > /dev/stderr + echo "Bail out!" exit 1 } @@ -363,7 +364,7 @@ files_destroy() name_create() { - echo "zfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5 | cut -b -8`" + echo "zfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5 | awk '{ print $NF }'`" } names_create() |