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

memtest86-efi: backport to 19.03 #61806

Merged
merged 3 commits into from Jul 28, 2019

Conversation

cdepillabout
Copy link
Member

This PR backports the following PRs to 19.03:

These PRs do two big things:

  1. Create a memtest86-efi derivation for the newer unfree version of Memtest86 that supports running on UEFI.
  2. Add a NixOS option to install the Memtest86 EFI app so it is available from the systemd-boot menu.
Motivation for this change

The above PRs have all been merged into master. I wanted this functionality available in 19.03 as well.

You can try building the memtest86-efi command with the following, as long as you have this PR checked out:

$ nix-build -A memtest86-efi

You can test installing the memtest86 EFI app with the following nixos setting:

{ config, pkgs, ...}:

{
  boot.loader.systemd-boot.memtest86.enable = true;
}

Although you need to be using systemd-boot for this to work.

Also, you need allowUnfree set to true for both of these to work.

Pinging @c0bw3b and @JohnAZoidberg since they were nice enough to do reviews for the above PRs. Also pinging @Lassulus and @matthewbauer since they merged in the above PRs.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/11

@fpletz fpletz added this to the 19.03 milestone Jun 11, 2019
@samueldr
Copy link
Member

Any reason for 20e0daa13574aaa55841d778bf5fbdfd3f8d6432 not cherry-picking -x ecb90ae?

Copy link
Member

@samueldr samueldr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving, though would be interested in knowing the answer of the question in my (just added) previous comment before merging. Though it looks good enough, and is a useful backport.

The libguestfs backport is non-intrusive, and the memtest86 backport isn't either. In the end a net positive for end-users that may need to test their memory.

Roosembert Palacios and others added 3 commits July 28, 2019 10:00
Appliances are necessary when building images using virt-builder.
(e.g. `virt-builder -o debian-9.img debian-9`)

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
(cherry picked from commit ecb90ae)
This creates a new package, memtest86-efi.  This is a recent version of
the unfree version of memtest86.

There appear to be no restrictions on the use or redistribution of this.

Backport from NixOS#60967.

(cherry picked from commit d273bf5)
(cherry picked from commit e01e13a)
(cherry picked from commit 439a755)
(cherry picked from commit 4abafaf)
….03)

This commit adds support for installing the memtest86 EFI app and adding
a boot entry for it with systemd-boot.

Backported from NixOS#61036.

(cherry picked from commit b12ea62)
(cherry picked from commit d88d675)
@cdepillabout
Copy link
Member Author

@samueldr Thanks for reviewing this.

Any reason for 20e0daa not cherry-picking -x ecb90ae?

No good reason. I probably just forgot to cherry-pick -x it.

I just went back and re-did the commits so that ecb90ae has been cherry-picked. Hopefully it should be good to merge now.

@samueldr samueldr merged commit 16144ba into NixOS:release-19.03 Jul 28, 2019
@samueldr
Copy link
Member

Thank you!

@cdepillabout cdepillabout deleted the backport-memtest86 branch July 28, 2019 03:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants