Skip to content

Commit

Permalink
types: make deviceDependencies optional
Browse files Browse the repository at this point in the history
  • Loading branch information
Lassulus committed Nov 10, 2022
1 parent c615235 commit 78d9448
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions types.nix
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ rec {
create :: types.devices -> str
*/
create = devices: let
sortedDeviceList = diskoLib.sortDevicesByDependencies (diskoLib.meta devices).deviceDependencies devices;
sortedDeviceList = diskoLib.sortDevicesByDependencies ((diskoLib.meta devices).deviceDependencies or {}) devices;
in ''
set -efux
${concatStrings (map (dev: attrByPath (dev ++ [ "_create" ]) "" devices) sortedDeviceList)}
Expand All @@ -141,7 +141,7 @@ rec {
*/
mount = devices: let
fsMounts = diskoLib.deepMergeMap (dev: dev._mount.fs or {}) (flatten (map attrValues (attrValues devices)));
sortedDeviceList = diskoLib.sortDevicesByDependencies (diskoLib.meta devices).deviceDependencies devices;
sortedDeviceList = diskoLib.sortDevicesByDependencies ((diskoLib.meta devices).deviceDependencies or {}) devices;
in ''
set -efux
# first create the neccessary devices
Expand Down

0 comments on commit 78d9448

Please sign in to comment.