summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2015-04-03 04:13:19 -0500
committerAustin Seipp <aseipp@pobox.com>2015-04-03 04:13:19 -0500
commit1c1083345bc23eb236d7792b51b2dc048d356789 (patch)
treee2671845e6dba4bc9fa0b6f4fc1dd0228f1274d3 /nixos/modules/config
parent52b71fc13b60103b44796eb8f920e4be1048ad89 (diff)
parent5cb2cee954342d9ddd67a82e3226f5d1a3207ce6 (diff)
downloadnixpkgs-1c1083345bc23eb236d7792b51b2dc048d356789.tar
nixpkgs-1c1083345bc23eb236d7792b51b2dc048d356789.tar.gz
nixpkgs-1c1083345bc23eb236d7792b51b2dc048d356789.tar.bz2
nixpkgs-1c1083345bc23eb236d7792b51b2dc048d356789.tar.lz
nixpkgs-1c1083345bc23eb236d7792b51b2dc048d356789.tar.xz
nixpkgs-1c1083345bc23eb236d7792b51b2dc048d356789.tar.zst
nixpkgs-1c1083345bc23eb236d7792b51b2dc048d356789.zip
Merge pull request #7058 from joachifm/sysctl-kptr-restrict
nixos: condition sysctl.kptr_restrict on features.grsecurity
Diffstat (limited to 'nixos/modules/config')
-rw-r--r--nixos/modules/config/sysctl.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 3b6ccd380c7..e83562a8356 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -64,6 +64,6 @@ in
     #
     # Removed under grsecurity.
     boot.kernel.sysctl."kernel.kptr_restrict" =
-      if config.security.grsecurity.enable then null else 1;
+      if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1;
   };
 }