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, 2015 by Delphix. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/inuse/inuse.cfg
--- 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.
#
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/inuse/inuse.cfg
*** 47,57 ****
{
#
# Remove dump device.
#
if [[ -n $PREVDUMPDEV ]]; then
! log_must $DUMPADM -u -d $PREVDUMPDEV > /dev/null
fi
destroy_pool $TESTPOOL
}
--- 47,57 ----
{
#
# Remove dump device.
#
if [[ -n $PREVDUMPDEV ]]; then
! log_must dumpadm -u -d $PREVDUMPDEV > /dev/null
fi
destroy_pool $TESTPOOL
}
*** 60,86 ****
log_onexit cleanup
typeset dumpdev=""
typeset diskslice=""
! PREVDUMPDEV=`$DUMPADM | $GREP "Dump device" | $AWK '{print $3}'`
log_note "Zero $FS_DISK0 and place free space in to slice 0"
log_must cleanup_devices $FS_DISK0
diskslice="/dev/dsk/${FS_DISK0}s0"
log_note "Configuring $diskslice as dump device"
! log_must $DUMPADM -d $diskslice > /dev/null
log_note "Confirm that dump device has been setup"
! dumpdev=`$DUMPADM | $GREP "Dump device" | $AWK '{print $3}'`
[[ -z "$dumpdev" ]] && log_untested "No dump device has been configured"
[[ "$dumpdev" != "$diskslice" ]] && \
log_untested "Dump device has not been been configured to $diskslice"
log_note "Attempt to zpool the dump device"
unset NOINUSE_CHECK
! log_mustnot $ZPOOL create $TESTPOOL "$diskslice"
log_mustnot poolexists $TESTPOOL
log_pass "Unable to zpool a device in use by dumpadm"
--- 60,86 ----
log_onexit cleanup
typeset dumpdev=""
typeset diskslice=""
! PREVDUMPDEV=`dumpadm | grep "Dump device" | awk '{print $3}'`
log_note "Zero $FS_DISK0 and place free space in to slice 0"
log_must cleanup_devices $FS_DISK0
diskslice="/dev/dsk/${FS_DISK0}s0"
log_note "Configuring $diskslice as dump device"
! log_must dumpadm -d $diskslice > /dev/null
log_note "Confirm that dump device has been setup"
! dumpdev=`dumpadm | grep "Dump device" | awk '{print $3}'`
[[ -z "$dumpdev" ]] && log_untested "No dump device has been configured"
[[ "$dumpdev" != "$diskslice" ]] && \
log_untested "Dump device has not been been configured to $diskslice"
log_note "Attempt to zpool the dump device"
unset NOINUSE_CHECK
! log_mustnot zpool create $TESTPOOL "$diskslice"
log_mustnot poolexists $TESTPOOL
log_pass "Unable to zpool a device in use by dumpadm"