From a049d842292fc891a13a80e8725df31657308195 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 1 Jul 2021 00:11:35 +1000 Subject: [PATCH 1/2] nixos/filesystems/exfat: use "exfatprogs" instead of "exfat" if kernel > 5.7 5.7+ comes with a native exfat implementation, exfatprogs should be used instead. The exfat package puts a "mount.exfat" binary in the path, which causes mount to prefer the FUSE version to the non-fuse one. There's no way to disable the binary, so switch to exfatprogs. --- nixos/modules/tasks/filesystems/exfat.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix index 1527f993fdd4..540b9b91c3ec 100644 --- a/nixos/modules/tasks/filesystems/exfat.nix +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -4,8 +4,10 @@ with lib; { config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { - - system.fsPackages = [ pkgs.exfat ]; - + system.fsPackages = if config.boot.kernelPackages.kernelOlder "5.7" then [ + pkgs.exfat # FUSE + ] else [ + pkgs.exfatprogs # non-FUSE + ]; }; } From 57b933a911666922d6fc329ccc02446228ac5f6f Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 1 Jul 2021 00:11:47 +1000 Subject: [PATCH 2/2] nixos/doc: add note about switching to exfatprogs --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a138d4c8780c..dd6245273c5b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -847,6 +847,15 @@ Superuser created successfully. release instead of 1.0.x + + + If exfat is included in + boot.supportedFilesystems and when using + kernel 5.7 or later, the exfatprogs + user-space utilities are used instead of + exfat. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 35d65dc43cf3..64f3f495651a 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -246,6 +246,9 @@ To be able to access the web UI this port needs to be opened in the firewall. - The `nomad` package now defaults to a 1.1.x release instead of 1.0.x +- If `exfat` is included in `boot.supportedFilesystems` and when using kernel 5.7 + or later, the `exfatprogs` user-space utilities are used instead of `exfat`. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.