summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-09-13 13:51:14 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-09-13 17:06:13 +0300
commit0c0188c5d258881b16da49a129ffa406e17f7e89 (patch)
tree0156fdf191549f2d80be412fb75627178745fd08 /pkgs/os-specific
parentb4a4a63cc4ed8ebd8c1fbbfb3b89a408e907045a (diff)
downloadnixpkgs-0c0188c5d258881b16da49a129ffa406e17f7e89.tar
nixpkgs-0c0188c5d258881b16da49a129ffa406e17f7e89.tar.gz
nixpkgs-0c0188c5d258881b16da49a129ffa406e17f7e89.tar.bz2
nixpkgs-0c0188c5d258881b16da49a129ffa406e17f7e89.tar.lz
nixpkgs-0c0188c5d258881b16da49a129ffa406e17f7e89.tar.xz
nixpkgs-0c0188c5d258881b16da49a129ffa406e17f7e89.tar.zst
nixpkgs-0c0188c5d258881b16da49a129ffa406e17f7e89.zip
kernel config: Explicitly enable some NLS-related things
Doesn't affect x86, but ARM can't mount VFAT filesystems without this on
a 3.18 kernel.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 54e6b7822f9..107c87434de 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -270,6 +270,13 @@ with stdenv.lib;
     SQUASHFS_LZ4 y
   ''}
 
+  # Native Language Support modules, needed by some filesystems
+  NLS y
+  NLS_DEFAULT utf8
+  NLS_UTF8 m
+  NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option
+  NLS_ISO8859_1 m    # VFAT default for the iocharset= mount option
+
   # Runtime security tests
   DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages