diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-20 12:02:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 12:02:05 +0000 |
| commit | 3202dd166c491b8389c130d80dde3a377f650741 (patch) | |
| tree | f01981a4772ae7a89265dcf9f32ab04e45866053 /nixos | |
| parent | b53692cdc6c06881578f206239291326ed42a78c (diff) | |
| parent | 578dd8d634f0a4666f7481f6ea9e578114da74f8 (diff) | |
| download | nixlib-3202dd166c491b8389c130d80dde3a377f650741.tar nixlib-3202dd166c491b8389c130d80dde3a377f650741.tar.gz nixlib-3202dd166c491b8389c130d80dde3a377f650741.tar.bz2 nixlib-3202dd166c491b8389c130d80dde3a377f650741.tar.lz nixlib-3202dd166c491b8389c130d80dde3a377f650741.tar.xz nixlib-3202dd166c491b8389c130d80dde3a377f650741.tar.zst nixlib-3202dd166c491b8389c130d80dde3a377f650741.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/backup/sanoid.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index be44a43b6d3f..abc4def1c61f 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -108,8 +108,8 @@ in { type = types.attrsOf (types.submodule ({config, options, ...}: { freeformType = datasetSettingsType; options = commonOptions // datasetOptions; - config.use_template = mkAliasDefinitions (options.useTemplate or {}); - config.process_children_only = mkAliasDefinitions (options.processChildrenOnly or {}); + config.use_template = mkAliasDefinitions (mkDefault options.useTemplate or {}); + config.process_children_only = mkAliasDefinitions (mkDefault options.processChildrenOnly or {}); })); default = {}; description = "Datasets to snapshot."; |