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,44 ****
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/zvol/zvol_common.shlib
  
  verify_runnable "global"
  
  ismounted $TESTDIR ufs
! (( $? == 0 )) && log_must $UMOUNT -f $TESTDIR
  
! [[ -e $TESTDIR ]] && $RM -rf $TESTDIR
  
  default_zvol_cleanup
  
  log_pass
--- 24,44 ----
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/zvol/zvol_common.shlib
  
  verify_runnable "global"
  
  ismounted $TESTDIR ufs
! (( $? == 0 )) && log_must umount -f $TESTDIR
  
! [[ -e $TESTDIR ]] && rm -rf $TESTDIR
  
  default_zvol_cleanup
  
  log_pass