diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2023-03-27 21:11:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 21:11:41 +0200 |
| commit | 90b5f42ec92f15e5943ede53153a801a3dedbba0 (patch) | |
| tree | dbc0097811ed3db41516d7aca65e022e7fdff349 | |
| parent | 2749074b2e2960fc97aaeca251f3152d6e6effb7 (diff) | |
| parent | 56fa7ab066165a2eb6274a0ab423b518e3e115b4 (diff) | |
| download | nixlib-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar nixlib-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.gz nixlib-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.bz2 nixlib-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.lz nixlib-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.xz nixlib-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.zst nixlib-90b5f42ec92f15e5943ede53153a801a3dedbba0.zip | |
Merge pull request #222946 from RaitoBezarius/zfs-6_2-6_3-compat
zfsUnstable: make it compatible again with 6.2.8 and potentially 6.3
| -rw-r--r-- | nixos/tests/zfs.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 3e55369daa06..bcb9d9bcfd60 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -12,6 +12,7 @@ let then pkgs.zfsUnstable.latestCompatibleLinuxPackages else pkgs.linuxPackages , enableUnstable ? false + , enableSystemdStage1 ? false , extraTest ? "" }: makeTest { @@ -36,6 +37,7 @@ let boot.kernelPackages = kernelPackage; boot.supportedFilesystems = [ "zfs" ]; boot.zfs.enableUnstable = enableUnstable; + boot.initrd.systemd.enable = enableSystemdStage1; environment.systemPackages = [ pkgs.parted ]; @@ -176,6 +178,11 @@ in { enableUnstable = true; }; + unstableWithSystemdStage1 = makeZfsTest "unstable" { + enableUnstable = true; + enableSystemdStage1 = true; + }; + installer = (import ./installer.nix { }).zfsroot; expand-partitions = makeTest { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5e5ec6d79312..750586ff1b1d 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -256,5 +256,13 @@ in { sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U="; isUnstable = true; + + # Necessary for 6.2.8+ and 6.3 compatibility, see https://github.com/openzfs/zfs/issues/14658 + extraPatches = [ + (fetchpatch { + url = "https://github.com/openzfs/zfs/pull/14668.patch"; + hash = "sha256-PR7hxxdjLkjszADdw0R0JRmBPfDlsXG6D+VfC7QzEhk="; + }) + ]; }; } |