From 188cf0a6d370f363c9aa8e8ba66e4f24f2a260aa Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 4 Apr 2011 13:49:19 -0500 Subject: [PATCH] xfstests: ensure selinux xattrs don't interfere with quota tests 219 and 235 were failing on ext3 with selinux, because the extra xattrs upped the quota usage. Do the same trick we've used in the past to mount with an selinux global context when doing quota tests. Note the gross hack for remount,ro, though. Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig Reviewed-by: Alex Elder --- 235 | 5 +++++ common.quota | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/235 b/235 index 5d9c7c0f..7150fca1 100755 --- a/235 +++ b/235 @@ -61,6 +61,11 @@ chown $qa_user:$qa_user $SCRATCH_MNT/testfile repquota -u -g $SCRATCH_MNT | grep -v "^root" | _filter_scratch +# XXX This is a nasty hack. remount doesn't work on a fileystem +# with a context; see https://bugzilla.redhat.com/show_bug.cgi?id=563267 +# +# We work around it by editing the context out of mtab. Sigh. +sed -i "s#^$SCRATCH_DEV\(.*\),context=\"system_u:object_r:nfs_t:s0\"#$SCRATCH_DEV\1#" /etc/mtab mount -o remount,ro $SCRATCH_DEV 2>&1 | tee -a $seq.full | _filter_scratch touch $SCRATCH_MNT/failed 2>&1 | tee -a $seq.full | _filter_scratch mount -o remount,rw $SCRATCH_DEV 2>&1 | tee -a $seq.full | _filter_scratch diff --git a/common.quota b/common.quota index 96a36a64..3c87ce14 100644 --- a/common.quota +++ b/common.quota @@ -45,6 +45,13 @@ _require_quota() _notrun "disk quotas not supported by this filesystem type: $FSTYP" ;; esac + + # 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 + export SELINUX_MOUNT_OPTIONS="-o context=system_u:object_r:nfs_t:s0" + fi } # -- 2.47.3