From owner-svn-src-user@freebsd.org Mon May 1 08:01:56 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 471ACD598EF for ; Mon, 1 May 2017 08:01:56 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F20BBEC7; Mon, 1 May 2017 08:01:55 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4181sN4036924; Mon, 1 May 2017 08:01:54 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4181s88036921; Mon, 1 May 2017 08:01:54 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705010801.v4181s88036921@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 1 May 2017 08:01:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317641 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2017 08:01:56 -0000 Author: pho Date: Mon May 1 08:01:54 2017 New Revision: 317641 URL: https://svnweb.freebsd.org/changeset/base/317641 Log: Test for ufs_extattr and if setfacl(1) exist. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/extattr.sh user/pho/stress2/misc/extattr_set_fd.sh user/pho/stress2/misc/extattrctl.sh Modified: user/pho/stress2/misc/extattr.sh ============================================================================== --- user/pho/stress2/misc/extattr.sh Mon May 1 07:52:22 2017 (r317640) +++ user/pho/stress2/misc/extattr.sh Mon May 1 08:01:54 2017 (r317641) @@ -34,6 +34,8 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg +[ "`sysctl -in kern.features.ufs_extattr`" != "1" ] && exit 0 +[ -z "`which setfacl`" ] && exit 0 odir=`pwd` Modified: user/pho/stress2/misc/extattr_set_fd.sh ============================================================================== --- user/pho/stress2/misc/extattr_set_fd.sh Mon May 1 07:52:22 2017 (r317640) +++ user/pho/stress2/misc/extattr_set_fd.sh Mon May 1 08:01:54 2017 (r317641) @@ -34,6 +34,8 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg +[ "`sysctl -in kern.features.ufs_extattr`" != "1" ] && exit 0 +[ -z "`which setfacl`" ] && exit 0 here=`pwd` cd /tmp Modified: user/pho/stress2/misc/extattrctl.sh ============================================================================== --- user/pho/stress2/misc/extattrctl.sh Mon May 1 07:52:22 2017 (r317640) +++ user/pho/stress2/misc/extattrctl.sh Mon May 1 08:01:54 2017 (r317641) @@ -42,27 +42,28 @@ . ../default.cfg -sysctl -a | ! grep -q ufs_extattr && echo "Missing options UFS_EXTATTR" && exit 1 +[ "`sysctl -in kern.features.ufs_extattr`" != "1" ] && exit 0 +[ -z "`which setfacl`" ] && exit 0 -mount | grep "${mntpoint}" | grep -q md${mdstart}${part} && umount $mntpoint +mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 20m -u $mdstart bsdlabel -w md$mdstart auto -newfs -O 1 md${mdstart}${part} > /dev/null -mount /dev/md${mdstart}${part} $mntpoint +newfs -O 1 md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint -mkdir -p ${mntpoint}/.attribute/system -cd ${mntpoint}/.attribute/system +mkdir -p $mntpoint/.attribute/system +cd $mntpoint/.attribute/system extattrctl initattr -p . 388 posix1e.acl_access extattrctl initattr -p . 388 posix1e.acl_default cd / umount /mnt -tunefs -a enable /dev/md${mdstart}${part} -mount /dev/md${mdstart}${part} $mntpoint -mount | grep md${mdstart}${part} +tunefs -a enable /dev/md${mdstart}$part +mount /dev/md${mdstart}$part $mntpoint +mount | grep md${mdstart}$part touch $mntpoint/acl-test setfacl -b $mntpoint/acl-test