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>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_002_neg.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_002_neg.ksh
↓ open down ↓ 20 lines elided ↑ open up ↑
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  # Copyright 2015 Nexenta Systems, Inc.
  28   28  #
  29   29  
  30   30  #
  31      -# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
       31 +# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  32   32  #
  33   33  
  34   34  . $STF_SUITE/include/libtest.shlib
  35   35  
  36   36  #
  37   37  # DESCRIPTION:
  38   38  #
  39   39  # Invalid datasets are rejected as boot property values
  40   40  #
  41   41  # STRATEGY:
  42   42  #
  43   43  # 1. Create a zvol 
  44   44  # 2. Verify that we can't set the bootfs to that dataset
  45   45  #
  46   46  
  47   47  verify_runnable "global"
  48   48  
  49   49  function cleanup {
  50   50          if datasetexists $TESTPOOL/vol
  51   51          then
  52      -                log_must $ZFS destroy $TESTPOOL/vol
       52 +                log_must zfs destroy $TESTPOOL/vol
  53   53          fi
  54   54          if poolexists $TESTPOOL
  55   55          then
  56      -                log_must $ZPOOL destroy $TESTPOOL
       56 +                log_must zpool destroy $TESTPOOL
  57   57          fi
  58   58          if [[ -f $VDEV ]]; then
  59      -                log_must $RM -f $VDEV
       59 +                log_must rm -f $VDEV
  60   60          fi
  61   61  }
  62   62  
  63   63  
  64      -$ZPOOL set 2>&1 | $GREP bootfs > /dev/null
       64 +zpool set 2>&1 | grep bootfs > /dev/null
  65   65  if [ $? -ne 0 ]
  66   66  then
  67   67          log_unsupported "bootfs pool property not supported on this release."
  68   68  fi
  69   69  
  70   70  log_assert "Invalid datasets are rejected as boot property values"
  71   71  log_onexit cleanup
  72   72  
  73   73  typeset VDEV=/bootfs_002_neg_a.$$.dat
  74   74  
  75      -log_must $MKFILE 400m $VDEV
       75 +log_must mkfile 400m $VDEV
  76   76  create_pool "$TESTPOOL" "$VDEV"
  77      -log_must $ZFS create -V 10m $TESTPOOL/vol
       77 +log_must zfs create -V 10m $TESTPOOL/vol
  78   78  
  79      -log_mustnot $ZPOOL set bootfs=$TESTPOOL/vol $TESTPOOL
       79 +log_mustnot zpool set bootfs=$TESTPOOL/vol $TESTPOOL
  80   80  
  81   81  log_pass "Invalid datasets are rejected as boot property values"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX