about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-10-02 18:30:15 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2016-10-02 19:25:58 +0200
commit1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7 (patch)
tree82993bd7e9f9b344d39f8dd61aa96f8dbc8ca6c2 /nixos
parenta58f5ffbb9a202279cdcc0a5d45ed14a59dd6176 (diff)
downloadnixlib-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar
nixlib-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.gz
nixlib-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.bz2
nixlib-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.lz
nixlib-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.xz
nixlib-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.zst
nixlib-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.zip
grsecurity: make GRKERNSEC y and PAX y implicit
These options should always be specified. Note, an implication of this
change is that not specifying any grsec/PaX options results in a build
failure.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/security/grsecurity.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml
index 28415e89bfab..d70891544496 100644
--- a/nixos/modules/security/grsecurity.xml
+++ b/nixos/modules/security/grsecurity.xml
@@ -208,8 +208,6 @@
         let
           kernel = pkgs.linux_grsec_nixos.override {
             extraConfig = ''
-              GRKERNSEC y
-              PAX y
               GRKERNSEC_CONFIG_AUTO y
               GRKERNSEC_CONFIG_SERVER y
               GRKERNSEC_CONFIG_SECURITY y