Mirrors/disko
2
0
Fork 0
mirror of https://github.com/nix-community/disko synced 2024-11-10 06:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

types.table: get device mountOptions the correct way

Browse source
This commit is contained in:
lassulus 2023-01-28 16:52:04 +01:00
parent 08dc4d06da
commit f49536f004
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
types.nix
View file

@ -211,7 +211,7 @@ rec {
in '' in ''
set -efux set -efux
# first create the necessary devices # first create the necessary devices
${concatMapStrings (dev: ((attrByPath (dev ++ [ "_mount" ]) "" devices) {}).dev or "") sortedDeviceList} ${concatMapStrings (dev: ((attrByPath (dev ++ [ "_mount" ]) {} devices) {}).dev or "") sortedDeviceList}
# and then mount the filesystems in alphabetical order # and then mount the filesystems in alphabetical order
${concatStrings (attrValues fsMounts)} ${concatStrings (attrValues fsMounts)}
@ -680,9 +680,7 @@ rec {
let let
partMounts = diskoLib.deepMergeMap (partition: partition._mount {inherit dev;}) config.partitions; partMounts = diskoLib.deepMergeMap (partition: partition._mount {inherit dev;}) config.partitions;
in { in {
dev = '' dev = partMounts.dev or "";
${concatMapStrings (x: x.dev or "") (attrValues partMounts)}
'';
fs = partMounts.fs or {}; fs = partMounts.fs or {};
}; };
}; };