about summary refs log tree commit diff
path: root/nixos/modules/system/boot/kexec.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-09-28 17:33:49 +0200
committeraszlig <aszlig@nix.build>2018-09-28 17:44:42 +0200
commitfd8bca45c994fc3b36dce4263c1d4419493f193e (patch)
tree2ffd31557593fa5f546a2a41c06628a1b4ccc9af /nixos/modules/system/boot/kexec.nix
parent82cafa41cb5a135da6fff622d385591158eb5f54 (diff)
nixos/kexec: Fix typo in meta.platforms
Evaluation error introduced in 599c4df46a90c7415a6cc0689f0b23d22e7fdb67.

There is only a "platformS" attribute in kexectools.meta, so let's use
this and from the code in the kexec module it operates on a list,
matching the corresponding platforms, so this seems to be the attribute
the original author intended.

Tested by building nixos/tests/kexec.nix on x86_64-linux and while it
evaluates now, the test still fails by timing out shortly after the
kexec:

machine: waiting for the VM to finish booting
machine# Cannot find the ESP partition mount point.

This however seems to be an unrelated issue and was also the case before
the commit mentioned above.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @dezgeg
Diffstat (limited to 'nixos/modules/system/boot/kexec.nix')
-rw-r--r--nixos/modules/system/boot/kexec.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index b95673d825b32..61f9c6d0e7eb9 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, ... }:
 
 {
-  config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platform) {
+  config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platforms) {
     environment.systemPackages = [ pkgs.kexectools ];
 
     systemd.services."prepare-kexec" =