From ac77c6630aabb42b5bf6a76e2e7a1654bd42d722 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 8 Jun 2020 10:25:33 -0400 Subject: [PATCH] fixup uefi test by passing all initrds as cmdline args --- pkgs/pxescript/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/pxescript/default.nix b/pkgs/pxescript/default.nix index ee55308..61e2f7b 100644 --- a/pkgs/pxescript/default.nix +++ b/pkgs/pxescript/default.nix @@ -4,10 +4,13 @@ , pkgs , }: +let + cmdlineinitrds = builtins.concatStringsSep " " (builtins.map (name: "initrd=${name}") (builtins.attrNames initrds)); +in runCommand "netboot" { pxe = '' #!ipxe - kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} + kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init ${cmdlineinitrds} ${toString config.boot.kernelParams} ${builtins.concatStringsSep "\n" (builtins.attrValues (builtins.mapAttrs (name: path: "initrd ${name}") initrds))} initrd initrd boot