about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-11-20 22:10:34 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2016-11-20 23:01:22 +0100
commit2eb6ec1bc491b5a6ed7f6d5164ca6366f986da49 (patch)
treef972f0d1a4b58c58e435df456afa9c9c71b2facf /nixos
parent98935c7103927690b4ca366a2763140081615794 (diff)
downloadnixlib-2eb6ec1bc491b5a6ed7f6d5164ca6366f986da49.tar
nixlib-2eb6ec1bc491b5a6ed7f6d5164ca6366f986da49.tar.gz
nixlib-2eb6ec1bc491b5a6ed7f6d5164ca6366f986da49.tar.bz2
nixlib-2eb6ec1bc491b5a6ed7f6d5164ca6366f986da49.tar.lz
nixlib-2eb6ec1bc491b5a6ed7f6d5164ca6366f986da49.tar.xz
nixlib-2eb6ec1bc491b5a6ed7f6d5164ca6366f986da49.tar.zst
nixlib-2eb6ec1bc491b5a6ed7f6d5164ca6366f986da49.zip
grsecurity module: remove code pertaining to zfs
I don't know if it still the case that zfs fails to boot; either way,
that's the user's responsibility to contend with.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/security/grsecurity.nix14
1 files changed, 0 insertions, 14 deletions
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index c37bcb70d9d2..ea245ecc5b6a 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -6,14 +6,6 @@ let
   cfg = config.security.grsecurity;
   grsecLockPath = "/proc/sys/kernel/grsecurity/grsec_lock";
 
-  # Ascertain whether ZFS is required for booting the system; grsecurity is
-  # currently incompatible with ZFS, rendering the system unbootable.
-  zfsNeededForBoot = filter
-    (fs: (fs.neededForBoot
-          || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ])
-          && fs.fsType == "zfs")
-    config.system.build.fileSystems != [];
-
   # Ascertain whether NixOS container support is required
   containerSupportRequired =
     config.boot.enableContainers && config.containers != {};
@@ -132,11 +124,5 @@ in
       "kernel.grsecurity.chroot_caps" = mkForce 0;
     };
 
-    assertions = [
-      { assertion = !zfsNeededForBoot;
-        message = "grsecurity is currently incompatible with ZFS";
-      }
-    ];
-
   };
 }