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>

*** 22,53 **** # Copyright 2007 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 # if we're running NIS, turn it off until we clean up # (it can cause useradd to take a long time, hitting our TIMEOUT) ! USES_NIS=FALSE ! $SVCS svc:/network/nis/client:default | $GREP online > /dev/null if [ $? -eq 0 ] then ! $SVCADM disable -t svc:/network/nis/client:default USES_NIS=true fi # Make sure we use a brand new user for this ZFS_USER=zxtr ZFS_GROUP=staff while [ -z "${FOUND}" ] do COUNT=0 ! USER_EXISTS=$( $GREP $ZFS_USER /etc/passwd ) if [ ! -z "${USER_EXISTS}" ] then ZFS_USER="${ZFS_USER}${COUNT}" COUNT=$(( $COUNT + 1 )) else --- 22,53 ---- # Copyright 2007 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 # if we're running NIS, turn it off until we clean up # (it can cause useradd to take a long time, hitting our TIMEOUT) ! USES_NIS=false ! svcs svc:/network/nis/client:default | grep online > /dev/null if [ $? -eq 0 ] then ! svcadm disable -t svc:/network/nis/client:default USES_NIS=true fi # Make sure we use a brand new user for this ZFS_USER=zxtr ZFS_GROUP=staff while [ -z "${FOUND}" ] do COUNT=0 ! USER_EXISTS=$( grep $ZFS_USER /etc/passwd ) if [ ! -z "${USER_EXISTS}" ] then ZFS_USER="${ZFS_USER}${COUNT}" COUNT=$(( $COUNT + 1 )) else
*** 55,64 **** fi done log_must add_user $ZFS_GROUP $ZFS_USER ! $ECHO $ZFS_USER > /tmp/zfs-xattr-test-user.txt ! $ECHO $USES_NIS > /tmp/zfs-xattr-test-nis.txt DISK=${DISKS%% *} default_setup $DISK --- 55,64 ---- fi done log_must add_user $ZFS_GROUP $ZFS_USER ! echo $ZFS_USER > /tmp/zfs-xattr-test-user.txt ! echo $USES_NIS > /tmp/zfs-xattr-test-nis.txt DISK=${DISKS%% *} default_setup $DISK