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

diff --git a/etc/init.d/zfs.fedora.in b/etc/init.d/zfs.fedora.in
index 178637800e5af89b9ffb702a4ac13bc18605fb57..86f430dce925a9d445e5f7bd9b407c6846b7d936 100644 (file)
--- 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 e626f7905262ceb2b29665199d7d0b9d6ba06358..8a61349e8cee0e183f1698364b8f9f30eb67401c 100644 (file)
--- 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 227787d2239eb037d5c1d9f74a08c52395b2d480..5fa3275b9720eaa71435c0fe690826fb14d4953e 100644 (file)
--- 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