public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/znapzend: fix when no previous zetup 

When the znapzend module was enabled for the first time with pure =
true; then the list of previous entries is empty, but xargs still tried
to execute a znapzendzetup delete command with no arguments, which made
it fail
This commit is contained in:
Silvan Mosberger 2018-02-17 15:50:48 +01:00
parent 588fe10bae
commit c2b8d14b56
No known key found for this signature in database
GPG Key ID: 9424360B4B85C9E7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/backup/znapzend.nix
View File

@ -386,7 +386,7 @@ in
echo Resetting znapzend zetups echo Resetting znapzend zetups
${pkgs.znapzend}/bin/znapzendzetup list \ ${pkgs.znapzend}/bin/znapzendzetup list \
| grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \ | grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \
| xargs ${pkgs.znapzend}/bin/znapzendzetup delete | xargs -I{} ${pkgs.znapzend}/bin/znapzendzetup delete "{}"
'' + concatStringsSep "\n" (mapAttrsToList (dataset: config: '' '' + concatStringsSep "\n" (mapAttrsToList (dataset: config: ''
echo Importing znapzend zetup ${config} for dataset ${dataset} echo Importing znapzend zetup ${config} for dataset ${dataset}
${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config} ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config}