Unverified Commit b475b0c7 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #331712 from Mic92/fix-netboot 

Fix netboot
parents e18c970b d79b03a5

nixos/modules/installer/netboot/netboot.nix

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ with lib; 
      prepend = [ "${config.system.build.initialRamdisk}/initrd" ];



      contents =

        [ { object = config.system.build.squashfsStore;

            symlink = "/nix-store.squashfs";

        [ { source = config.system.build.squashfsStore;

            target = "/nix-store.squashfs";

          }

        ];

    };

pkgs/build-support/kernel/make-initrd-ng/src/main.rs

+6 −1
Original line number Diff line number Diff line
@@ -326,7 +326,12 @@ fn main() -> eyre::Result<()> { 
    let contents =

        fs::read(&args[1]).wrap_err_with(|| format!("failed to open file {:?}", &args[1]))?;

    let input = serde_json::from_slice::<Vec<StoreInput>>(&contents)

        .wrap_err_with(|| format!("failed to parse JSON in {:?}", &args[1]))?;

        .wrap_err_with(|| {

            let text = String::from_utf8_lossy(&contents);

            format!("failed to parse JSON '{}' in {:?}",

                text,

                &args[1])

        })?;

    let output = &args[2];

    let out_path = Path::new(output);