Print this page
7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
*** 24,34 ****
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
! # Copyright (c) 2013 by Delphix. All rights reserved.
#
#
# A function to determine if a given pool name has an entry in cachefile
# returns 1 if the pool is not in the cache, 0 otherwise.
--- 24,34 ----
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
#
#
# A function to determine if a given pool name has an entry in cachefile
# returns 1 if the pool is not in the cache, 0 otherwise.
*** 36,46 ****
# checking for the pool name in the strings output of
# the given cachefile, default is /etc/zfs/zpool.cache
typeset cachefile=${2:-$CPATH}
! RESULT=$($STRINGS $cachefile | $GREP -w $1)
if [ -z "$RESULT" ]
then
return 1
fi
return 0
--- 36,46 ----
# checking for the pool name in the strings output of
# the given cachefile, default is /etc/zfs/zpool.cache
typeset cachefile=${2:-$CPATH}
! RESULT=$(strings $cachefile | grep -w $1)
if [ -z "$RESULT" ]
then
return 1
fi
return 0