1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-22 01:11:02 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-25 00:01:35 +00:00 committed by GitHub
commit a37fbac53b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 775 additions and 312 deletions

View file

@ -44,7 +44,7 @@ in {
# Sync snapshot taken by sanoid
"pool/sanoid" = {
target = "root@target:pool/sanoid";
extraArgs = [ "--no-sync-snap" ];
extraArgs = [ "--no-sync-snap" "--create-bookmark" ];
};
# Take snapshot and sync
"pool/syncoid".target = "root@target:pool/syncoid";
@ -92,8 +92,9 @@ in {
# Sync snapshots
target.wait_for_open_port(22)
source.succeed("touch /mnt/pool/syncoid/test.txt")
source.systemctl("start --wait syncoid.service")
source.systemctl("start --wait syncoid-pool-sanoid.service")
target.succeed("cat /mnt/pool/sanoid/test.txt")
source.systemctl("start --wait syncoid-pool-syncoid.service")
target.succeed("cat /mnt/pool/syncoid/test.txt")
'';
})