Don't include ntfs-3g by default

Issue #7117.

Changed files
+19 -7
nixos
modules
installer
profiles
tasks
-3
nixos/modules/installer/cd-dvd/installation-cd-base.nix
···
# Get a console as soon as the initrd loads fbcon on EFI boot.
boot.initrd.kernelModules = [ "fbcon" ];
-
# Add support for cow filesystems and their utilities
-
boot.supportedFilesystems = [ "zfs" "btrfs" ];
-
# Configure host id for ZFS to work
networking.hostId = "8425e349";
···
# Get a console as soon as the initrd loads fbcon on EFI boot.
boot.initrd.kernelModules = [ "fbcon" ];
# Configure host id for ZFS to work
networking.hostId = "8425e349";
+1
nixos/modules/module-list.nix
···
./tasks/filesystems/f2fs.nix
./tasks/filesystems/jfs.nix
./tasks/filesystems/nfs.nix
./tasks/filesystems/reiserfs.nix
./tasks/filesystems/unionfs-fuse.nix
./tasks/filesystems/vfat.nix
···
./tasks/filesystems/f2fs.nix
./tasks/filesystems/jfs.nix
./tasks/filesystems/nfs.nix
+
./tasks/filesystems/ntfs.nix
./tasks/filesystems/reiserfs.nix
./tasks/filesystems/unionfs-fuse.nix
./tasks/filesystems/vfat.nix
+1 -1
nixos/modules/profiles/base.nix
···
];
# Include support for various filesystems.
-
boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" ];
}
···
];
# Include support for various filesystems.
+
boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "zfs" "ntfs" ];
}
+1 -3
nixos/modules/tasks/filesystems.nix
···
# 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.etc.fstab.text =
let
···
# Add the mount helpers to the system path so that `mount' can find them.
system.fsPackages = [ pkgs.dosfstools ];
+
environment.systemPackages = [ pkgs.fuse ] ++ config.system.fsPackages;
environment.etc.fstab.text =
let
+16
nixos/modules/tasks/filesystems/ntfs.nix
···
···
+
{ 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
+
'';
+
};
+
}