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 <sandeen@xxxxxxxxxx> --- diff --git a/235 b/235 index 5d9c7c0..de0d0fc 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 96a36a6..3c87ce1 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 } # _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
