diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-04-01 22:25:21 +0200 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2020-04-01 22:28:53 +0200 |
| commit | 121b17e1ac3fa41d82c827a9a9cfa505a0730871 (patch) | |
| tree | cc06e5d0d98680d90bb5cd97911e87569578d4b2 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | b9a4e6953d0234cde64ac0cc55136adb3e92794b (diff) | |
| download | nixpkgs-121b17e1ac3fa41d82c827a9a9cfa505a0730871.tar nixpkgs-121b17e1ac3fa41d82c827a9a9cfa505a0730871.tar.gz nixpkgs-121b17e1ac3fa41d82c827a9a9cfa505a0730871.tar.bz2 nixpkgs-121b17e1ac3fa41d82c827a9a9cfa505a0730871.tar.lz nixpkgs-121b17e1ac3fa41d82c827a9a9cfa505a0730871.tar.xz nixpkgs-121b17e1ac3fa41d82c827a9a9cfa505a0730871.tar.zst nixpkgs-121b17e1ac3fa41d82c827a9a9cfa505a0730871.zip | |
kernel: fix errors in configuration
With the fix in kernel configuration merging, some kernel configuration items marked as mandatory now correctly trigger an error when unused (while they previously were unused).
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2c8b8de65b3..f1762054661 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; @@ -179,7 +179,7 @@ let # needed for ss INET_DIAG = yes; - INET_TCP_DIAG = module; + INET_TCP_DIAG = option module; INET_UDP_DIAG = module; INET_RAW_DIAG = whenAtLeast "4.14" module; INET_DIAG_DESTROY = whenAtLeast "4.9" yes; @@ -337,7 +337,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; @@ -368,7 +368,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 @@ -676,7 +676,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; |