summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-05-15 16:33:45 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-05-15 18:38:14 -0700
commit19d5b1e37a077c692d877f2eb05088f1c1c96c47 (patch)
treea7b775f2c869fc0532a37140a9b17a9e1d6120ed /pkgs/os-specific
parentfcf15de248a5a88c25da0f0f18669bed89d5f1d8 (diff)
downloadnixlib-19d5b1e37a077c692d877f2eb05088f1c1c96c47.tar
nixlib-19d5b1e37a077c692d877f2eb05088f1c1c96c47.tar.gz
nixlib-19d5b1e37a077c692d877f2eb05088f1c1c96c47.tar.bz2
nixlib-19d5b1e37a077c692d877f2eb05088f1c1c96c47.tar.lz
nixlib-19d5b1e37a077c692d877f2eb05088f1c1c96c47.tar.xz
nixlib-19d5b1e37a077c692d877f2eb05088f1c1c96c47.tar.zst
nixlib-19d5b1e37a077c692d877f2eb05088f1c1c96c47.zip
kernel-config: nfs changes
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix18
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5fdfdb3b6a13..a49a5c10c9cb 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -190,18 +190,26 @@ with stdenv.lib;
   OCFS2_DEBUG_MASKLOG? n
   BTRFS_FS_POSIX_ACL y
   UBIFS_FS_ADVANCED_COMPR? y
+  ${optionalString (versionAtLeast version "4.0") ''
+    NFSD_PNFS y
+  ''}
+  NFSD_V2_ACL y
+  NFSD_V3 y
+  NFSD_V3_ACL y
+  NFSD_V4 y
+  ${optionalString (versionAtLeast version "3.11") ''
+    NFSD_V4_SECURITY_LABEL y
+  ''}
+  NFS_FSCACHE y
   ${optionalString (versionAtLeast version "3.6") ''
     NFS_SWAP y
   ''}
+  NFS_V3_ACL y
   ${optionalString (versionAtLeast version "3.11") ''
     NFS_V4_1 y  # NFSv4.1 client support
     NFS_V4_2 y
+    NFS_V4_SECURITY_LABEL y
   ''}
-  NFSD_V2_ACL y
-  NFSD_V3 y
-  NFSD_V3_ACL y
-  NFSD_V4 y
-  NFS_FSCACHE y
   CIFS_XATTR y
   CIFS_POSIX y
   CIFS_FSCACHE y