summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-02-13 13:32:48 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-02-13 13:32:48 +0100
commite783edc72e6194032610b90ed169ddb2d48a093a (patch)
tree39875f11a76ab82ef4e62b731e58b277d0d802c2 /pkgs/os-specific
parent970d57a598329d70f67b8a5dff7942fdf404741e (diff)
parenta43db5fa2025c998ce0d72dc7dd425152d26ad59 (diff)
downloadnixpkgs-e783edc72e6194032610b90ed169ddb2d48a093a.tar
nixpkgs-e783edc72e6194032610b90ed169ddb2d48a093a.tar.gz
nixpkgs-e783edc72e6194032610b90ed169ddb2d48a093a.tar.bz2
nixpkgs-e783edc72e6194032610b90ed169ddb2d48a093a.tar.lz
nixpkgs-e783edc72e6194032610b90ed169ddb2d48a093a.tar.xz
nixpkgs-e783edc72e6194032610b90ed169ddb2d48a093a.tar.zst
nixpkgs-e783edc72e6194032610b90ed169ddb2d48a093a.zip
Merge pull request #6296 from nckx/add-kernel-config
Enable kernel configuration option FANOTIFY
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4f08e5a6fd8..2afbed13cae 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -49,7 +49,6 @@ with stdenv.lib;
   NUMA? y
 
   # Disable some expensive (?) features.
-  FTRACE n
   KPROBES n
   PM_TRACE_RTC n
 
@@ -148,6 +147,7 @@ with stdenv.lib;
 
   # Filesystem options - in particular, enable extended attributes and
   # ACLs for all filesystems that support them.
+  FANOTIFY y
   EXT2_FS_XATTR y
   EXT2_FS_POSIX_ACL y
   EXT2_FS_SECURITY y