diff options
| author | Adam Stephens <adam@valkor.net> | 2023-10-14 08:18:46 -0400 |
|---|---|---|
| committer | Adam Stephens <adam@valkor.net> | 2023-10-21 12:16:31 -0400 |
| commit | 1a81fe0cc89a4eb7c28c7a6b376700c9af869709 (patch) | |
| tree | 9ae84d3352f8743b1f175c9f980f9482445fcf47 /nixos | |
| parent | ea0dcd0ae14b99c5740acc7a1b874ea4446cb5be (diff) | |
zfs: 2.1.13 -> 2.2.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2311.section.md | 2 | ||||
| -rw-r--r-- | nixos/tests/zfs.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 9a682077230c5..2cdde5ec7ae7b 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -339,6 +339,8 @@ - `jq` was updated to 1.7, its [first release in 5 years](https://github.com/jqlang/jq/releases/tag/jq-1.7). +- `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0). + - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. - DocBook option documentation is no longer supported, all module documentation now uses markdown. diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 800f5e43cd15c..3454fbaf78fe5 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -113,8 +113,6 @@ let }; testScript = '' - # TODO: Remove this when upgrading stable to zfs 2.2.0 - unstable = ${if enableUnstable then "True" else "False"}; machine.wait_for_unit("multi-user.target") machine.succeed( "zpool status", @@ -136,8 +134,6 @@ let machine.crash() machine.wait_for_unit("multi-user.target") machine.succeed("zfs set sharesmb=on rpool/shared_smb") - if not unstable: - machine.succeed("zfs share rpool/shared_smb") machine.succeed( "smbclient -gNL localhost | grep rpool_shared_smb", "umount /tmp/mnt", |