diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-04-19 21:27:52 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-04-19 22:06:45 +0200 |
commit | 57b05765c968c1ad5245c59513d11d679ed7130d (patch) | |
tree | 7e24ae7382c597b933434e2e0532be8ec559a24e /nixos/modules/tasks | |
parent | c0f70b4694bb2be1c25ef0e23e3f11f9d718d162 (diff) | |
download | nixpkgs-57b05765c968c1ad5245c59513d11d679ed7130d.tar nixpkgs-57b05765c968c1ad5245c59513d11d679ed7130d.tar.gz nixpkgs-57b05765c968c1ad5245c59513d11d679ed7130d.tar.bz2 nixpkgs-57b05765c968c1ad5245c59513d11d679ed7130d.tar.lz nixpkgs-57b05765c968c1ad5245c59513d11d679ed7130d.tar.xz nixpkgs-57b05765c968c1ad5245c59513d11d679ed7130d.tar.zst nixpkgs-57b05765c968c1ad5245c59513d11d679ed7130d.zip |
Don't include ntfs-3g by default
Issue #7117.
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r-- | nixos/modules/tasks/filesystems.nix | 4 | ||||
-rw-r--r-- | nixos/modules/tasks/filesystems/ntfs.nix | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index c6f2f072352..ce8d6079faa 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -137,9 +137,7 @@ in # Add the mount helpers to the system path so that `mount' can find them. system.fsPackages = [ pkgs.dosfstools ]; - environment.systemPackages = - [ pkgs.ntfs3g pkgs.fuse ] - ++ config.system.fsPackages; + environment.systemPackages = [ pkgs.fuse ] ++ config.system.fsPackages; environment.etc.fstab.text = let diff --git a/nixos/modules/tasks/filesystems/ntfs.nix b/nixos/modules/tasks/filesystems/ntfs.nix new file mode 100644 index 00000000000..32cf07098dc --- /dev/null +++ b/nixos/modules/tasks/filesystems/ntfs.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + config = mkIf (any (fs: fs == "ntfs" || fs == "ntfs-3g") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.ntfs3g ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "jfs" ]; + + boot.initrd.extraUtilsCommands = mkIf inInitrd '' + copy_bin_and_libs ${pkgs.jfsutils}/sbin/fsck.jfs + ''; + }; +} |