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>

*** 12,22 ****
  #
  # CDDL HEADER END
  #
  
  #
! # Copyright (c) 2015 by Delphix. All rights reserved.
  #
  
  function get_conf_section # regex conf
  {
          typeset dsk_line next_vd_line conf section
--- 12,22 ----
  #
  # CDDL HEADER END
  #
  
  #
! # Copyright (c) 2015, 2016 by Delphix. All rights reserved.
  #
  
  function get_conf_section # regex conf
  {
          typeset dsk_line next_vd_line conf section
*** 102,112 ****
  {
          if datasetexists $TESTPOOL ; then
                  log_must zpool destroy -f $TESTPOOL
          fi
          if [[ -e $conf ]]; then
!                 log_must $RM -f "$conf"
          fi
          if [[ -e $POOL2 ]]; then
                  log_must zpool destroy -f $POOL2
          fi
  }
--- 102,112 ----
  {
          if datasetexists $TESTPOOL ; then
                  log_must zpool destroy -f $TESTPOOL
          fi
          if [[ -e $conf ]]; then
!                 log_must rm -f "$conf"
          fi
          if [[ -e $POOL2 ]]; then
                  log_must zpool destroy -f $POOL2
          fi
  }