Merge pull request #1010 from offlinehacker.

Although this is a release canidate version of kernel 3.12, there are reasons for merging this anyway, as discussed in #1010 and #1006. Thanks to @offlinehacker for this and the initial pull request.
2013-09-25 14:05:33 +02:00
parent 8e3df6a494 69f30432dd
commit 2e89b40634
3 changed files with 33 additions and 0 deletions
@@ -169,6 +169,9 @@ with stdenv.lib;
  SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
  DEVKMEM n # Disable /dev/kmem
  CC_STACKPROTECTOR y # Detect buffer overflows on the stack
+  ${optionalString (versionAtLeast version "3.12") ''
+    USER_NS y # Support for user namespaces
+  ''}

  # Misc. options.
  8139TOO_8129 y