From 685d9fe348f00e71584a27cc841b8058e6cbee3f Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 17 Dec 2024 17:09:36 +0100 Subject: [PATCH] nixos/repart-verity-store: use mkDefault for partition types This makes it a bit easier to switch between using the default usr veritysetup generator or the nix-store veritysetup generator. --- nixos/modules/image/repart-verity-store.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/image/repart-verity-store.nix b/nixos/modules/image/repart-verity-store.nix index 9e8a4b7f85ba..15d0ce88872f 100644 --- a/nixos/modules/image/repart-verity-store.nix +++ b/nixos/modules/image/repart-verity-store.nix @@ -92,7 +92,7 @@ in image.repart.partitions = { # dm-verity hash partition ${cfg.partitionIds.store-verity}.repartConfig = { - Type = partitionTypes.usr-verity; + Type = lib.mkDefault partitionTypes.usr-verity; Verity = "hash"; VerityMatchKey = lib.mkDefault verityMatchKey; Label = lib.mkDefault "store-verity"; @@ -101,7 +101,7 @@ in ${cfg.partitionIds.store} = { storePaths = [ config.system.build.toplevel ]; repartConfig = { - Type = partitionTypes.usr; + Type = lib.mkDefault partitionTypes.usr; Verity = "data"; Format = lib.mkDefault "erofs"; VerityMatchKey = lib.mkDefault verityMatchKey;