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

nixos/repart-verity-store: use mkDefault for partition types

Browse Source 
This makes it a bit easier to switch between using the default usr
veritysetup generator or the nix-store veritysetup generator.
This commit is contained in:
WilliButz
2024-12-17 17:09:36 +01:00
parent 8404744352
commit 685d9fe348
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/image/repart-verity-store.nix
View File

@@ -92,7 +92,7 @@ in
image.repart.partitions = { image.repart.partitions = {
# dm-verity hash partition # dm-verity hash partition
${cfg.partitionIds.store-verity}.repartConfig = { ${cfg.partitionIds.store-verity}.repartConfig = {
Type = partitionTypes.usr-verity; Type = lib.mkDefault partitionTypes.usr-verity;
Verity = "hash"; Verity = "hash";
VerityMatchKey = lib.mkDefault verityMatchKey; VerityMatchKey = lib.mkDefault verityMatchKey;
Label = lib.mkDefault "store-verity"; Label = lib.mkDefault "store-verity";
@@ -101,7 +101,7 @@ in
${cfg.partitionIds.store} = { ${cfg.partitionIds.store} = {
storePaths = [ config.system.build.toplevel ]; storePaths = [ config.system.build.toplevel ];
repartConfig = { repartConfig = {
Type = partitionTypes.usr; Type = lib.mkDefault partitionTypes.usr;
Verity = "data"; Verity = "data";
Format = lib.mkDefault "erofs"; Format = lib.mkDefault "erofs";
VerityMatchKey = lib.mkDefault verityMatchKey; VerityMatchKey = lib.mkDefault verityMatchKey;