Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fea63944fd4b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6440000547ca
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 11, 2020

  1. maintainers: Add SlothOfAnarchy

    @SlothOfAnarchy
    SlothOfAnarchy committed May 11, 2020
    Copy the full SHA
    e719550 View commit details

  2. nixos/znapzend: Add oracleMode feature; add maintainer 

    The feature destroys snapshots one-by-one instead of all at once.
If many snapshots accumulated, destroying them all at once can fail
because the argument list is too long. See
https://github.com/oetiker/znapzend/blob/master/lib/ZnapZend/ZFS.pm#L284
    @SlothOfAnarchy
    SlothOfAnarchy committed May 11, 2020
    Copy the full SHA
    90533bf View commit details

Commits on May 12, 2020

  1. Merge pull request #87599 from helsinki-systems/znapzend-oracle-mode

    @infinisil
    infinisil authored May 12, 2020
    Copy the full SHA
    6440000 View commit details
Showing with 13 additions and 1 deletion.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +7 −1 nixos/modules/services/backup/znapzend.nix
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -7136,6 +7136,12 @@
githubId = 1505617;
name = "Sean Lee";
};
SlothOfAnarchy = {
email = "slothofanarchy1@gmail.com";
github = "SlothOfAnarchy";
githubId = 12828415;
name = "Michel Weitbrecht";
};
smakarov = {
email = "setser200018@gmail.com";
github = "setser";
8 changes: 7 additions & 1 deletion nixos/modules/services/backup/znapzend.nix
View file
Original file line number Diff line number Diff line change
@@ -358,6 +358,12 @@ in
default = false;
};

features.oracleMode = mkEnableOption ''
Destroy snapshots one by one instead of using one long argument list.
If source and destination are out of sync for a long time, you may have
so many snapshots to destroy that the argument gets is too long and the
command fails.
'';
features.recvu = mkEnableOption ''
recvu feature which uses <literal>-u</literal> on the receiving end to keep the destination
filesystem unmounted.
@@ -459,5 +465,5 @@ in
};
};

meta.maintainers = with maintainers; [ infinisil ];
meta.maintainers = with maintainers; [ infinisil SlothOfAnarchy ];
}