about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-03-12 21:41:53 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-03-12 21:41:53 +0100
commitebef57364198d59e0a5a7371d96c36666ccdd534 (patch)
treed94aaad5c6dea223b7f411c9510ae0348c504c7b
parent9cda91bcd88194d6d19c82106d64bafe39499774 (diff)
parent0d1c39443b616408886cd8e9597d498c35d17e66 (diff)
Merge pull request #6476 from ts468/squashfs
Change kernel config: improve squashfs support of kernel
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 90f012f282d34..c1939f3218e92 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -194,6 +194,12 @@ with stdenv.lib;
   ${optionalString (versionAtLeast version "3.14") ''
     CEPH_FS_POSIX_ACL y
   ''}
+  SQUASHFS_FILE_DIRECT y
+  SQUASHFS_DECOMP_MULTI_PERCPU y
+  SQUASHFS_XATTR y
+  SQUASHFS_ZLIB y
+  SQUASHFS_LZO y
+  SQUASHFS_XZ y
 
   # Security related features.
   STRICT_DEVMEM y # Filter access to /dev/mem