From: Josef Bacik Date: Tue, 13 May 2014 05:30:15 +0000 (+1000) Subject: config: fix selinux context handling X-Git-Tag: v2022.05.01~3137 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b6689ad6a50a8e0b1e745637ad7f28982879ed6c;p=users%2Fhch%2Fxfstests-dev.git config: fix selinux context handling With the new config stuff we lost the selinux options being set for systems with selinux turned on. We want the selinux context set all the time, wether we provide a MOUNT_OPTIONS value or not, so take this logic out of _mount_opts() and just put it in the body of common/config Signed-off-by: Josef Bacik Reviewed-by: Eric Sandeen Signed-off-by: Dave Chinner --- diff --git a/common/config b/common/config index 5d87ef591..0dbf0b9c5 100644 --- a/common/config +++ b/common/config @@ -217,16 +217,16 @@ case "$HOSTOS" in ;; 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 + SELINUX_MOUNT_OPTIONS="-o context=system_u:object_r:nfs_t:s0" + export SELINUX_MOUNT_OPTIONS +fi + _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" - export SELINUX_MOUNT_OPTIONS - fi - case $FSTYP in xfs) export MOUNT_OPTIONS=$XFS_MOUNT_OPTIONS