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:
parent
7809eb8b65
commit
51268f31a8
|
@ -126,12 +126,6 @@ start()
|
||||||
return 5
|
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.
|
# Delay until all required block devices are present.
|
||||||
udevadm settle
|
udevadm settle
|
||||||
|
|
||||||
|
|
|
@ -49,14 +49,6 @@ start()
|
||||||
{
|
{
|
||||||
[ -f "$LOCKFILE" ] && return 3
|
[ -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.
|
# Delay until all required block devices are present.
|
||||||
udevadm settle
|
udevadm settle
|
||||||
|
|
||||||
|
|
|
@ -76,12 +76,6 @@ start()
|
||||||
return 5
|
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.
|
# Delay until all required block devices are present.
|
||||||
if [ -x /sbin/udevadm ]; then
|
if [ -x /sbin/udevadm ]; then
|
||||||
/sbin/udevadm settle
|
/sbin/udevadm settle
|
||||||
|
|
Loading…
Reference in New Issue