Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #61806 from cdepillabout/backport-memtest86
memtest86-efi: backport to 19.03
  • Loading branch information
samueldr committed Jul 28, 2019
2 parents 112f522 + 3c21a29 commit 16144ba
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 0 deletions.
Expand Up @@ -33,6 +33,15 @@ def system_dir(profile, generation):
options {kernel_params}
"""

# The boot loader entry for memtest86.
#
# TODO: This is hard-coded to use the 64-bit EFI app, but it could probably
# be updated to use the 32-bit EFI app on 32-bit systems. The 32-bit EFI
# app filename is BOOTIA32.efi.
MEMTEST_BOOT_ENTRY = """title MemTest86
efi /efi/memtest86/BOOTX64.efi
"""

def write_loader_conf(profile, generation):
with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f:
if "@timeout@" != "":
Expand Down Expand Up @@ -201,6 +210,24 @@ def main():
if os.readlink(system_dir(*gen)) == args.default_config:
write_loader_conf(*gen)

memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf"
if os.path.exists(memtest_entry_file):
os.unlink(memtest_entry_file)
shutil.rmtree("@efiSysMountPoint@/efi/memtest86", ignore_errors=True)
if "@memtest86@" != "":
mkdir_p("@efiSysMountPoint@/efi/memtest86")
for path in glob.iglob("@memtest86@/*"):
if os.path.isdir(path):
shutil.copytree(path, os.path.join("@efiSysMountPoint@/efi/memtest86", os.path.basename(path)))
else:
shutil.copy(path, "@efiSysMountPoint@/efi/memtest86/")

memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf"
memtest_entry_file_tmp_path = "%s.tmp" % memtest_entry_file
with open(memtest_entry_file_tmp_path, 'w') as f:
f.write(MEMTEST_BOOT_ENTRY)
os.rename(memtest_entry_file_tmp_path, memtest_entry_file)

# Since fat32 provides little recovery facilities after a crash,
# it can leave the system in an unbootable state, when a crash/outage
# happens shortly after an update. To decrease the likelihood of this
Expand Down
15 changes: 15 additions & 0 deletions nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
Expand Up @@ -27,6 +27,8 @@ let
inherit (cfg) consoleMode;

inherit (efi) efiSysMountPoint canTouchEfiVariables;

memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else "";
};
in {

Expand Down Expand Up @@ -101,6 +103,19 @@ in {
</itemizedlist>
'';
};

memtest86 = {
enable = mkOption {
default = false;
type = types.bool;
description = ''
Make MemTest86 available from the systemd-boot menu. MemTest86 is a
program for testing memory. MemTest86 is an unfree program, so
this requires <literal>allowUnfree</literal> to be set to
<literal>true</literal>.
'';
};
};
};

config = mkIf cfg.enable {
Expand Down
55 changes: 55 additions & 0 deletions pkgs/tools/misc/memtest86-efi/default.nix
@@ -0,0 +1,55 @@
{ lib, stdenv, fetchurl, unzip, utillinux, libguestfs-with-appliance }:

stdenv.mkDerivation rec {
pname = "memtest86-efi";
version = "8.0";

src = fetchurl {
# TODO: The latest version of memtest86 is actually 8.1, but apparently the
# company has stopped distributing versioned binaries of memtest86:
# https://www.passmark.com/forum/memtest86/44494-version-8-1-distribution-file-is-not-versioned?p=44505#post44505
# However, it does look like redistribution is okay, so if we had
# somewhere to host binaries that we make sure to version, then we could
# probably keep up with the latest versions released by the company.
url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip";
sha256 = "147mnd7fnx2wvbzscw7pkg9ljiczhz05nb0cjpmww49a0ms4yknw";
};

nativeBuildInputs = [ libguestfs-with-appliance unzip ];

unpackPhase = ''
unzip -q $src -d .
'';

installPhase = ''
mkdir -p $out
# memtest86 is distributed as a bootable USB image. It contains the actual
# memtest86 EFI app.
#
# The following command uses libguestfs to extract the actual EFI app from the
# usb image so that it can be installed directly on the hard drive. This creates
# the ./BOOT/ directory with the memtest86 EFI app.
guestfish --ro --add ./memtest86-usb.img --mount /dev/sda1:/ copy-out /EFI/BOOT .
cp -r BOOT/* $out/
'';

meta = with lib; {
homepage = http://memtest86.com/;
downloadPage = "https://www.memtest86.com/download.htm";
description = "A tool to detect memory errors, to be run from a bootloader";
longDescription = ''
A UEFI app that is able to detect errors in RAM. It can be run from a
bootloader. Released under a proprietary freeware license.
'';
# The Memtest86 License for the Free Edition states,
# "MemTest86 Free Edition is free to download with no restrictions on usage".
# However the source code for Memtest86 does not appear to be available.
#
# https://www.memtest86.com/license.htm
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ cdepillabout ];
platforms = platforms.linux;
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -4239,6 +4239,8 @@ in

memtest86 = callPackage ../tools/misc/memtest86 { };

memtest86-efi = callPackage ../tools/misc/memtest86-efi { };

memtest86plus = callPackage ../tools/misc/memtest86+ { };

meo = callPackage ../tools/security/meo {
Expand Down Expand Up @@ -11069,6 +11071,8 @@ in

libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {};
libguestfs = callPackage ../development/libraries/libguestfs { };
libguestfs-with-appliance = libguestfs.override { appliance = libguestfs-appliance; };


libhangul = callPackage ../development/libraries/libhangul { };

Expand Down

0 comments on commit 16144ba

Please sign in to comment.