From 3839d29973edce1603db7f6d172f40ec5f8a5bb7 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Fri, 19 Feb 2010 09:33:45 -0600 Subject: [PATCH] xfstests: mount xfs with a context when selinux is on When selinux is on, we get tons of new xattrs, which messes up all kinds of output. The simplest way out of this, for now, seems to be to just mount with a global context instead and skip writing the extra xattrs. I've been using this internally on Fedora and RHEL for a while now. Signed-off-by: Eric Sandeen Reviewed-by: Dave Chinner --- 189 | 3 ++- common.rc | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/189 b/189 index 8f1c0e15d..e91d5cdd9 100755 --- a/189 +++ b/189 @@ -45,7 +45,8 @@ _cleanup() _scratch_filter() { sed -e "s#$SCRATCH_DEV#SCRATCH_DEV#" \ - -e "s#$SCRATCH_MNT#SCRATCH_MNT#" + -e "s#$SCRATCH_MNT#SCRATCH_MNT#" \ + -e "s#,context.*s0\"##" } _check_mount() diff --git a/common.rc b/common.rc index c76bcde08..ca2cd2cb2 100644 --- a/common.rc +++ b/common.rc @@ -47,8 +47,16 @@ _ls_l() _mount_opts() { + # SELinux adds extra xattrs which can mess up our expected output. + # So, mount with a context, and they won't be created + # nfs_t is a "liberal" context so we can use it. + if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then + SELINUX_MOUNT_OPTIONS="-o context=system_u:object_r:nfs_t:s0" + fi + case $FSTYP in xfs) + export SELINUX_MOUNT_OPTIONS export MOUNT_OPTIONS=$XFS_MOUNT_OPTIONS ;; udf) @@ -214,7 +222,7 @@ _scratch_mount_options() { _scratch_options mount - echo $SCRATCH_OPTIONS $MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT + echo $SCRATCH_OPTIONS $MOUNT_OPTIONS $SELINUX_MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT } _scratch_mount() @@ -236,7 +244,7 @@ _scratch_remount() _test_mount() { _test_options mount - _mount -t $FSTYP $TEST_OPTIONS $TEST_FS_MOUNT_OPTS $* $TEST_DEV $TEST_DIR + _mount -t $FSTYP $TEST_OPTIONS $TEST_FS_MOUNT_OPTS $SELINUX_MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR } _scratch_mkfs_options() -- 2.49.0