Fixup bug with zfs replication

This commit is contained in:
Benson Chu 2026-04-11 19:10:21 -05:00
parent cfacbff288
commit fafec15df6
3 changed files with 28 additions and 0 deletions

View file

@ -43,6 +43,7 @@
system = "x86_64-linux";
specialArgs = { inherit unstablePkgs updatePkgs nixos-hardware; };
modules = [
{ nixpkgs.overlays = [ (import ./overlays/zfs-replicate.nix) ]; }
./hosts/axl/configuration.nix
home-manager.nixosModules.home-manager
{

View file

@ -0,0 +1,20 @@
diff --git a/zfs/replicate/filesystem/list.py b/zfs/replicate/filesystem/list.py
<<<<<<< HEAD
index 0000000..1111111 100644
--- a/zfs/replicate/filesystem/list.py
+++ b/zfs/replicate/filesystem/list.py
@@ -42,7 +42,7 @@ def _list(filesystem: FileSystem) -> str:
=======
index 5e892e6..f33e11e 100644
--- a/zfs/replicate/filesystem/list.py
+++ b/zfs/replicate/filesystem/list.py
@@ -42,4 +42,4 @@ def list( # pylint: disable=W0622
def _list(filesystem: FileSystem) -> str:
>>>>>>> 773248e (Fixup bug with zfs replication)
options = ["-H", "-o name,readonly", "-t filesystem,volume", "-r"]
- return f"/usr/bin/env - zfs list {' '.join(options)} '{filesystem.name}'"
+ return f"/usr/bin/env zfs list {' '.join(options)} '{filesystem.name}'"
def _filesystems(zfs_list_output: bytes) -> List[FileSystem]:

View file

@ -0,0 +1,7 @@
final: prev: {
zfs-replicate = prev.zfs-replicate.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or []) ++ [
./zfs-replicate-env-fix.patch
];
});
}