Unverified Commit e3b83d45 authored by Fernando Rodrigues's avatar Fernando Rodrigues
Browse files

xen: fix IPXE sourcing 



`xl` needs a full path to the efirom executable.
This does not fix the qemu-dm issue. A stubdom is still required.

Reported-by: default avatarHeHongbo <hehongbo@mail.com>
Signed-off-by: default avatarFernando Rodrigues <alpha@sigmasquadron.net>
parent 1200719b

pkgs/build-support/xen/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ stdenv.mkDerivation (finalAttrs: { 
    "--with-system-qemu"

    (if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios")

    (if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf")

    (if withIPXE then "--with-system-ipxe=${ipxe}" else "--disable-ipxe")

    (if withIPXE then "--with-system-ipxe=${ipxe.firmware}" else "--disable-ipxe")

    (enableFeature withFlask "xsmpolicy")

  ];

pkgs/by-name/ip/ipxe/package.nix

+6 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
  embedScript ? null,

  additionalTargets ? { },

  additionalOptions ? [ ],

  firmwareBinary ? "ipxe.efirom",

}:



let
@@ -130,9 +131,12 @@ stdenv.mkDerivation (finalAttrs: { 


  enableParallelBuilding = true;



  passthru.updateScript = unstableGitUpdater {

  passthru = {

    firmware = "${finalAttrs.finalPackage}/${firmwareBinary}";

    updateScript = unstableGitUpdater {

      tagPrefix = "v";

    };

  };



  meta = {

    description = "Network boot firmware";