diff options
| author | aszlig <aszlig@nix.build> | 2020-09-14 23:41:28 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2020-09-14 23:51:16 +0200 |
| commit | f6561ac1edae7e795f1edaa96c73f4b34f0e9b04 (patch) | |
| tree | dce1b7b85df75bd785e9f36d6a9f7ad0cc0c9f57 /machines/sternenseemann | |
| parent | 6b872d71f22ec01d146935c28f37c49722a23255 (diff) | |
Use attribute sets for boot.initrd.luks.devices
This was one of the places where types.loaOf was still in place and it got removed a while[1] ago and this in turn causes evaluation to fail for quite a few machines: The option value `boot.initrd.luks.devices' in `...' is not of type `attribute set of submodules'. I've not only changed all the machines to use attribute sets but also fixed the check in core/tests.nix, because comparing against a list when the actual type is an attribute set will result in all the LUKS tests to be part of *all* channels, no matter whether you're actually using LUKS. [1]: https://github.com/NixOS/nixpkgs/commit/20d491a317d9956ddca80913f07 Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch Cc: @sternenseemann
Diffstat (limited to 'machines/sternenseemann')
| -rw-r--r-- | machines/sternenseemann/fliewatuet.nix | 2 | ||||
| -rw-r--r-- | machines/sternenseemann/schnurrkadse.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/machines/sternenseemann/fliewatuet.nix b/machines/sternenseemann/fliewatuet.nix index a621270a..9daa9ea1 100644 --- a/machines/sternenseemann/fliewatuet.nix +++ b/machines/sternenseemann/fliewatuet.nix @@ -10,7 +10,7 @@ in { boot.blacklistedKernelModules = [ "nouveau" "nvidia" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.initrd.luks.devices = [ { device = "/dev/sda2"; name = "crypted"; } ]; + boot.initrd.luks.devices.crypted.device = "/dev/sda2"; fileSystems."/" = { device = "/dev/dm-0"; diff --git a/machines/sternenseemann/schnurrkadse.nix b/machines/sternenseemann/schnurrkadse.nix index fc189956..383807ba 100644 --- a/machines/sternenseemann/schnurrkadse.nix +++ b/machines/sternenseemann/schnurrkadse.nix @@ -11,10 +11,10 @@ in { boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - boot.initrd.luks.devices = - [ { name = "schnurrkadse"; - device = "/dev/disk/by-uuid/544529b8-81cb-4e8e-9b6b-44f828ea2a7b"; - preLVM = true; } ]; + boot.initrd.luks.devices.schnurrkadse = { + device = "/dev/disk/by-uuid/544529b8-81cb-4e8e-9b6b-44f828ea2a7b"; + preLVM = true; + }; fileSystems."/" = { device = "/dev/mapper/schnurrkadse-root"; |