diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-08-25 12:24:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-25 12:24:39 +0200 |
commit | 49b5beea4376215f694181774c2ef00af0380f03 (patch) | |
tree | 9de458b7d49d3e2e25adf60b89af19375f8953de /nixos | |
parent | a285af49403a7ce48d7dd9bfda1e432c75c164ff (diff) | |
parent | 57b933a911666922d6fc329ccc02446228ac5f6f (diff) | |
download | nixpkgs-49b5beea4376215f694181774c2ef00af0380f03.tar nixpkgs-49b5beea4376215f694181774c2ef00af0380f03.tar.gz nixpkgs-49b5beea4376215f694181774c2ef00af0380f03.tar.bz2 nixpkgs-49b5beea4376215f694181774c2ef00af0380f03.tar.lz nixpkgs-49b5beea4376215f694181774c2ef00af0380f03.tar.xz nixpkgs-49b5beea4376215f694181774c2ef00af0380f03.tar.zst nixpkgs-49b5beea4376215f694181774c2ef00af0380f03.zip |
Merge pull request #128624 from vs49688/exfat
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 9 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 3 | ||||
-rw-r--r-- | nixos/modules/tasks/filesystems/exfat.nix | 8 |
3 files changed, 17 insertions, 3 deletions
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 65abc8ac482..6d02f71ac98 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 @@ -863,6 +863,15 @@ Superuser created successfully. release instead of 1.0.x </para> </listitem> + <listitem> + <para> + If <literal>exfat</literal> is included in + <literal>boot.supportedFilesystems</literal> and when using + kernel 5.7 or later, the <literal>exfatprogs</literal> + user-space utilities are used instead of + <literal>exfat</literal>. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index ae6ccf93298..a337a72b716 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -250,6 +250,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. diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix index 1527f993fdd..540b9b91c3e 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 + ]; }; } |