Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Remove SELinux enforcing check from init scripts 

The default SELinux policy for RHEL and Fedora has been updated
to include ZFS in the list of filesystems which support xattrs.
Therefore, there's no longer a need to detect this in the init
scripts.

References:
  https://bugzilla.redhat.com/show_bug.cgi?id=811532
  https://bugzilla.redhat.com/show_bug.cgi?id=816543

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2166
This commit is contained in:
Brian Behlendorf 2014-05-01 16:22:01 -07:00
parent 7809eb8b65
commit 51268f31a8
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/init.d/zfs.fedora.in
View File

@ -126,12 +126,6 @@ start()
return 5
}
# Requires selinux policy which has not been written.
if [ -r "/selinux/enforce" ] &&
[ "$(cat /selinux/enforce)" = "1" ]; then
action $"SELinux ZFS policy required: " /bin/false || return 6
fi
# Delay until all required block devices are present.
udevadm settle

8
etc/init.d/zfs.lsb.in
View File

@ -49,14 +49,6 @@ start()
{
[ -f "$LOCKFILE" ] && return 3
# Requires selinux policy which has not been written.
if [ -r "/selinux/enforce" ] &&
[ "$(cat /selinux/enforce)" = "1" ]; then
log_failure_msg "SELinux ZFS policy required"
return 4
fi
# Delay until all required block devices are present.
udevadm settle

6
etc/init.d/zfs.redhat.in
View File

@ -76,12 +76,6 @@ start()
return 5
}
# Requires selinux policy which has not been written.
if [ -r "/selinux/enforce" ] &&
[ "$(cat /selinux/enforce)" = "1" ]; then
action $"SELinux ZFS policy required: " /bin/false || return 6
fi
# Delay until all required block devices are present.
if [ -x /sbin/udevadm ]; then
/sbin/udevadm settle