Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/pixiecore: fix escaping of cmdline #87664

Merged
merged 1 commit into from May 12, 2020

Conversation

@betaboon
Copy link
Contributor

betaboon commented May 12, 2020

Motivation for this change

I wanted to boot qemu-machines using pixieboot but it failed.
turns out: the cmdline was escaped badly.

using the following configuration i can now boot a qemu-vm from network:

{ pkgs, lib, config, ... }:
{

  services.pixiecore = let
    nixos = import <nixpkgs/nixos> {
      configuration = { config, pkgs, lib, ... }: with lib; {
        imports = [
          <nixpkgs/nixos/modules/profiles/minimal.nix>
          <nixpkgs/nixos/modules/profiles/all-hardware.nix>
          <nixpkgs/nixos/modules/installer/netboot/netboot.nix>
        ];
      };
    };
    build = nixos.config.system.build;
  in {
    enable = true;
    debug = true;
    openFirewall = true;
    dhcpNoBind = true;
    kernel = "${build.kernel}/bzImage";
    initrd = "${toString build.netbootRamdisk}/initrd";
    cmdLine = "init=${build.toplevel}/init ${lib.concatStringsSep " " nixos.config.boot.kernelParams}";
  };

}
Things done

Fix double-escaping of cmdline.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

fyi @Mic92

@Mic92 Mic92 merged commit c643f6e into NixOS:master May 12, 2020
1 check was pending
1 check was pending
grahamcofborg-eval Checking new out paths
Details
@betaboon betaboon deleted the betaboon:nixos-pixiecore-fix-escaping branch May 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.