mirror of
https://github.com/nix-community/disko.git
synced 2024-09-17 09:37:17 +03:00
types: make deviceDependencies optional
This commit is contained in:
parent
c6152351f8
commit
78d9448fcf
@ -130,7 +130,7 @@ rec {
|
|||||||
create :: types.devices -> str
|
create :: types.devices -> str
|
||||||
*/
|
*/
|
||||||
create = devices: let
|
create = devices: let
|
||||||
sortedDeviceList = diskoLib.sortDevicesByDependencies (diskoLib.meta devices).deviceDependencies devices;
|
sortedDeviceList = diskoLib.sortDevicesByDependencies ((diskoLib.meta devices).deviceDependencies or {}) devices;
|
||||||
in ''
|
in ''
|
||||||
set -efux
|
set -efux
|
||||||
${concatStrings (map (dev: attrByPath (dev ++ [ "_create" ]) "" devices) sortedDeviceList)}
|
${concatStrings (map (dev: attrByPath (dev ++ [ "_create" ]) "" devices) sortedDeviceList)}
|
||||||
@ -141,7 +141,7 @@ rec {
|
|||||||
*/
|
*/
|
||||||
mount = devices: let
|
mount = devices: let
|
||||||
fsMounts = diskoLib.deepMergeMap (dev: dev._mount.fs or {}) (flatten (map attrValues (attrValues devices)));
|
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 ''
|
in ''
|
||||||
set -efux
|
set -efux
|
||||||
# first create the neccessary devices
|
# first create the neccessary devices
|
||||||
|
Loading…
Reference in New Issue
Block a user