diff options
| author | Brian Behlendorf <[email protected]> | 2014-05-01 16:22:01 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-05-02 11:37:46 -0700 |
| commit | 51268f31a8a5d5c7a48a449437001f77591587f2 (patch) | |
| tree | 37d9da6e6e75877858952d8f62a4fafa744cb136 | |
| parent | 7809eb8b65bec8e8ea09b2ea645d320e0b3a1710 (diff) | |
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 <[email protected]>
Closes #2166
| -rw-r--r-- | etc/init.d/zfs.fedora.in | 6 | ||||
| -rw-r--r-- | etc/init.d/zfs.lsb.in | 8 | ||||
| -rw-r--r-- | etc/init.d/zfs.redhat.in | 6 |
3 files changed, 0 insertions, 20 deletions
diff --git a/etc/init.d/zfs.fedora.in b/etc/init.d/zfs.fedora.in index 178637800..86f430dce 100644 --- a/etc/init.d/zfs.fedora.in +++ b/etc/init.d/zfs.fedora.in @@ -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 diff --git a/etc/init.d/zfs.lsb.in b/etc/init.d/zfs.lsb.in index e626f7905..8a61349e8 100644 --- a/etc/init.d/zfs.lsb.in +++ b/etc/init.d/zfs.lsb.in @@ -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 diff --git a/etc/init.d/zfs.redhat.in b/etc/init.d/zfs.redhat.in index 227787d22..5fa3275b9 100644 --- a/etc/init.d/zfs.redhat.in +++ b/etc/init.d/zfs.redhat.in @@ -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 |