diff options
author | Florian Klink <flokli@flokli.de> | 2020-05-22 13:32:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-22 13:32:22 +0200 |
commit | cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a (patch) | |
tree | 36b603fcf865967dede5ab7a4797cf068c668834 /pkgs/os-specific/linux/kernel | |
parent | 16d7f7edae6847e7a792d79b533b245f71907f46 (diff) | |
parent | bc6b37e9678f3a095211764b8d4f8c12d8ea7d4e (diff) | |
download | nixlib-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar nixlib-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.gz nixlib-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.bz2 nixlib-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.lz nixlib-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.xz nixlib-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.zst nixlib-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.zip |
Merge pull request #84032 from teto/fix_kernel_merge
Fix kernel configuration merge
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 9 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c715c7baf787..d239455ad344 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -42,7 +42,7 @@ let TIMER_STATS = whenOlder "4.11" yes; DEBUG_NX_TEST = whenOlder "4.11" no; DEBUG_STACK_USAGE = no; - DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) no; + DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) (option no); RCU_TORTURE_TEST = no; SCHEDSTATS = no; DETECT_HUNG_TASK = yes; @@ -184,7 +184,6 @@ let # needed for ss INET_DIAG = yes; - INET_TCP_DIAG = module; INET_UDP_DIAG = module; INET_RAW_DIAG = whenAtLeast "4.14" module; INET_DIAG_DESTROY = whenAtLeast "4.9" yes; @@ -365,7 +364,7 @@ let CIFS_STATS = whenOlder "4.19" yes; CIFS_WEAK_PW_HASH = yes; CIFS_UPCALL = yes; - CIFS_ACL = yes; + CIFS_ACL = option yes; CIFS_DFS_UPCALL = yes; CIFS_SMB2 = whenOlder "4.13" yes; @@ -396,7 +395,7 @@ let DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; }; RANDOMIZE_BASE = option yes; STRICT_DEVMEM = option yes; # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE = freeform "0"; # Disable SELinux by default + SECURITY_SELINUX_BOOTPARAM_VALUE = option (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; DEVKMEM = mkIf (!features.grsecurity) no; # Disable /dev/kmem @@ -709,7 +708,7 @@ let KEXEC_JUMP = option yes; # Windows Logical Disk Manager (Dynamic Disk) support - LDM_PARTITION = yes; + LDM_PARTITION = option yes; LOGIRUMBLEPAD2_FF = yes; # Logitech Rumblepad 2 force feedback LOGO = no; # not needed MEDIA_ATTACH = yes; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index e6e1bd842363..a9d0cf451688 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -158,11 +158,8 @@ let ; }).config; - # structuredConfig = moduleStructuredConfig.settings; }; - - }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { |