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>

*** 10,20 ****
  # source.  A copy of the CDDL is also available via the Internet at
  # http://www.illumos.org/license/CDDL.
  #
  
  #
! # Copyright (c) 2014 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/rsend/rsend.kshlib
  
--- 10,20 ----
  # source.  A copy of the CDDL is also available via the Internet at
  # http://www.illumos.org/license/CDDL.
  #
  
  #
! # Copyright (c) 2014, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/rsend/rsend.kshlib
  
*** 45,60 ****
  sendfs=$POOL/sendfs
  recvfs=$POOL2/recvfs
  streamfs=$POOL/stream
  
  test_fs_setup $POOL $POOL2
! log_must $ZFS bookmark $sendfs@a $sendfs#bm_a
! log_must $ZFS destroy $sendfs@a
! log_must $ZFS receive -v $recvfs </$POOL/initial.zsend
! resume_test "$ZFS send -i \#bm_a $sendfs@b" $streamfs $recvfs
! log_must $ZFS destroy -r -f $sendfs
! log_must $ZFS receive -v $sendfs </$POOL/initial.zsend
! log_must $ZFS receive -v $sendfs </$POOL/incremental.zsend
  file_check $sendfs $recvfs
  
  log_pass "Verify resumability of an incremental ZFS send/receive with ZFS " \
      "bookmarks"
--- 45,60 ----
  sendfs=$POOL/sendfs
  recvfs=$POOL2/recvfs
  streamfs=$POOL/stream
  
  test_fs_setup $POOL $POOL2
! log_must zfs bookmark $sendfs@a $sendfs#bm_a
! log_must zfs destroy $sendfs@a
! log_must zfs receive -v $recvfs </$POOL/initial.zsend
! resume_test "zfs send -i \#bm_a $sendfs@b" $streamfs $recvfs
! log_must zfs destroy -r -f $sendfs
! log_must zfs receive -v $sendfs </$POOL/initial.zsend
! log_must zfs receive -v $sendfs </$POOL/incremental.zsend
  file_check $sendfs $recvfs
  
  log_pass "Verify resumability of an incremental ZFS send/receive with ZFS " \
      "bookmarks"