commit 56700d64b1a189c8d11fcd5e27a18cb90ec68dd1 · pyrox.dev/nixpkgs

+11 -38

nixos/modules/system/boot/loader/grub/memtest.nix

···

       1
       -
       # This module adds Memtest86+/Memtest86 to the GRUB boot menu.

     

       2
       -
       

     

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

     

       4
        
       

     

       5
        
       with lib;

     

       6
        
       

     

       7
        
       let

     

       8
        
         memtest86 = pkgs.memtest86plus;

     

       9
       -
         efiSupport = config.boot.loader.grub.efiSupport;

     

       10
        
         cfg = config.boot.loader.grub.memtest86;

     

       11
        
       in

     

       12
        
       

     
···

       19
        
               default = false;

     

       20
        
               type = types.bool;

     

       21
        
               description = lib.mdDoc ''

     

       22
       -
                 Make Memtest86+ (or MemTest86 if EFI support is enabled),

     

       23
       -
                 a memory testing program, available from the

     

       24
       -
                 GRUB boot menu. MemTest86 is an unfree program, so

     

       25
       -
                 this requires `allowUnfree` to be set to

     

       26
       -
                 `true`.

     

       27
        
               '';

     

       28
        
             };

     

       29
        
       

     
···

       63
        
           };

     

       64
        
         };

     

       65
        
       

     

       66
       -
         config = mkMerge [

     

       67
       -
           (mkIf (cfg.enable && efiSupport) {

     

       68
       -
             assertions = [

     

       69
       -
               {

     

       70
       -
                 assertion = cfg.params == [];

     

       71
       -
                 message = "Parameters are not available for MemTest86";

     

       72
       -
               }

     

       73
       -
             ];

     

       74
       -
       

     

       75
       -
             boot.loader.grub.extraFiles = {

     

       76
       -
               "memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";

     

       77
       -
             };

     

       78
       -
       

     

       79
       -
             boot.loader.grub.extraEntries = ''

     

       80
       -
               menuentry "Memtest86" {

     

       81
       -
                 chainloader /memtest86.efi

     

       82
       -
               }

     

       83
       -
             '';

     

       84
       -
           })

     

       85
       -
       

     

       86
       -
           (mkIf (cfg.enable && !efiSupport) {

     

       87
       -
             boot.loader.grub.extraEntries = ''

     

       88
       -
               menuentry "Memtest86+" {

     

       89
       -
                 linux16 @bootRoot@/memtest.bin ${toString cfg.params}

     

       90
       -
               }

     

       91
       -
             '';

     

       92
       -
       

     

       93
       -
             boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";

     

       94
       -
           })

     

       95
       -
         ];

     

       96
        
       }

···

       1
       +
       # This module adds Memtest86+ to the GRUB boot menu.

     

       0
        
       
     

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

     

       3
        
       

     

       4
        
       with lib;

     

       5
        
       

     

       6
        
       let

     

       7
        
         memtest86 = pkgs.memtest86plus;

     

       0
        
       
     

       8
        
         cfg = config.boot.loader.grub.memtest86;

     

       9
        
       in

     

       10
        
       

     
···

       17
        
               default = false;

     

       18
        
               type = types.bool;

     

       19
        
               description = lib.mdDoc ''

     

       20
       +
                 Make Memtest86+, a memory testing program, available from the GRUB

     

       21
       +
                 boot menu.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
               '';

     

       23
        
             };

     

       24
        
       

     
···

       58
        
           };

     

       59
        
         };

     

       60
        
       

     

       61
       +
         config = mkIf cfg.enable {

     

       62
       +
           boot.loader.grub.extraEntries = ''

     

       63
       +
             menuentry "Memtest86+" {

     

       64
       +
               linux @bootRoot@/memtest.bin ${toString cfg.params}

     

       65
       +
             }

     

       66
       +
           '';

     

       67
       +
           boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";

     

       68
       +
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       69
        
       }

+8 -13

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

···

       32
        
       

     

       33
        
           inherit (config.system.nixos) distroName;

     

       34
        
       

     

       35
       -
           memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86-efi;

     

       36
        
       

     

       37
        
           netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi;

     

       38
        
       

     
···

       147
        
               default = false;

     

       148
        
               type = types.bool;

     

       149
        
               description = lib.mdDoc ''

     

       150
       -
                 Make MemTest86 available from the systemd-boot menu. MemTest86 is a

     

       151
       -
                 program for testing memory.  MemTest86 is an unfree program, so

     

       152
       -
                 this requires `allowUnfree` to be set to

     

       153
       -
                 `true`.

     

       154
        
               '';

     

       155
        
             };

     

       156
        
       

     
···

       193
        
             default = {};

     

       194
        
             example = literalExpression ''

     

       195
        
               { "memtest86.conf" = '''

     

       196
       -
                 title MemTest86

     

       197
       -
                 efi /efi/memtest86/memtest86.efi

     

       198
        
               '''; }

     

       199
        
             '';

     

       200
        
             description = lib.mdDoc ''

     
···

       213
        
             type = types.attrsOf types.path;

     

       214
        
             default = {};

     

       215
        
             example = literalExpression ''

     

       216
       -
               { "efi/memtest86/memtest86.efi" = "''${pkgs.memtest86-efi}/BOOTX64.efi"; }

     

       217
        
             '';

     

       218
        
             description = lib.mdDoc ''

     

       219
        
               A set of files to be copied to {file}`/boot`.

     
···

       276
        
           boot.loader.supportsInitrdSecrets = true;

     

       277
        
       

     

       278
        
           boot.loader.systemd-boot.extraFiles = mkMerge [

     

       279
       -
             # TODO: This is hard-coded to use the 64-bit EFI app, but it could probably

     

       280
       -
             # be updated to use the 32-bit EFI app on 32-bit systems.  The 32-bit EFI

     

       281
       -
             # app filename is BOOTIA32.efi.

     

       282
        
             (mkIf cfg.memtest86.enable {

     

       283
       -
               "efi/memtest86/BOOTX64.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";

     

       284
        
             })

     

       285
        
             (mkIf cfg.netbootxyz.enable {

     

       286
        
               "efi/netbootxyz/netboot.xyz.efi" = "${pkgs.netbootxyz-efi}";

     
···

       291
        
             (mkIf cfg.memtest86.enable {

     

       292
        
               "${cfg.memtest86.entryFilename}" = ''

     

       293
        
                 title  MemTest86

     

       294
       -
                 efi    /efi/memtest86/BOOTX64.efi

     

       295
        
               '';

     

       296
        
             })

     

       297
        
             (mkIf cfg.netbootxyz.enable {

···

       32
        
       

     

       33
        
           inherit (config.system.nixos) distroName;

     

       34
        
       

     

       35
       +
           memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86plus;

     

       36
        
       

     

       37
        
           netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi;

     

       38
        
       

     
···

       147
        
               default = false;

     

       148
        
               type = types.bool;

     

       149
        
               description = lib.mdDoc ''

     

       150
       +
                 Make MemTest86+ available from the systemd-boot menu. MemTest86+ is a

     

       151
       +
                 program for testing memory.

     

       0
        
       
     

       0
        
       
     

       152
        
               '';

     

       153
        
             };

     

       154
        
       

     
···

       191
        
             default = {};

     

       192
        
             example = literalExpression ''

     

       193
        
               { "memtest86.conf" = '''

     

       194
       +
                 title MemTest86+

     

       195
       +
                 efi /efi/memtest86/memtest.efi

     

       196
        
               '''; }

     

       197
        
             '';

     

       198
        
             description = lib.mdDoc ''

     
···

       211
        
             type = types.attrsOf types.path;

     

       212
        
             default = {};

     

       213
        
             example = literalExpression ''

     

       214
       +
               { "efi/memtest86/memtest.efi" = "''${pkgs.memtest86plus}/memtest.efi"; }

     

       215
        
             '';

     

       216
        
             description = lib.mdDoc ''

     

       217
        
               A set of files to be copied to {file}`/boot`.

     
···

       274
        
           boot.loader.supportsInitrdSecrets = true;

     

       275
        
       

     

       276
        
           boot.loader.systemd-boot.extraFiles = mkMerge [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       277
        
             (mkIf cfg.memtest86.enable {

     

       278
       +
               "efi/memtest86/memtest.efi" = "${pkgs.memtest86plus.efi}";

     

       279
        
             })

     

       280
        
             (mkIf cfg.netbootxyz.enable {

     

       281
        
               "efi/netbootxyz/netboot.xyz.efi" = "${pkgs.netbootxyz-efi}";

     
···

       286
        
             (mkIf cfg.memtest86.enable {

     

       287
        
               "${cfg.memtest86.entryFilename}" = ''

     

       288
        
                 title  MemTest86

     

       289
       +
                 efi    /efi/memtest86/memtest.efi

     

       290
        
               '';

     

       291
        
             })

     

       292
        
             (mkIf cfg.netbootxyz.enable {

+2 -8

nixos/tests/systemd-boot.nix

···

       118
        
           nodes.machine = { pkgs, lib, ... }: {

     

       119
        
             imports = [ common ];

     

       120
        
             boot.loader.systemd-boot.memtest86.enable = true;

     

       121
       -
             nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [

     

       122
       -
               "memtest86-efi"

     

       123
       -
             ];

     

       124
        
           };

     

       125
        
       

     

       126
        
           testScript = ''

     

       127
        
             machine.succeed("test -e /boot/loader/entries/memtest86.conf")

     

       128
       -
             machine.succeed("test -e /boot/efi/memtest86/BOOTX64.efi")

     

       129
        
           '';

     

       130
        
         };

     

       131
        
       

     
···

       152
        
             imports = [ common ];

     

       153
        
             boot.loader.systemd-boot.memtest86.enable = true;

     

       154
        
             boot.loader.systemd-boot.memtest86.entryFilename = "apple.conf";

     

       155
       -
             nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [

     

       156
       -
               "memtest86-efi"

     

       157
       -
             ];

     

       158
        
           };

     

       159
        
       

     

       160
        
           testScript = ''

     

       161
        
             machine.fail("test -e /boot/loader/entries/memtest86.conf")

     

       162
        
             machine.succeed("test -e /boot/loader/entries/apple.conf")

     

       163
       -
             machine.succeed("test -e /boot/efi/memtest86/BOOTX64.efi")

     

       164
        
           '';

     

       165
        
         };

     

       166

···

       118
        
           nodes.machine = { pkgs, lib, ... }: {

     

       119
        
             imports = [ common ];

     

       120
        
             boot.loader.systemd-boot.memtest86.enable = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       121
        
           };

     

       122
        
       

     

       123
        
           testScript = ''

     

       124
        
             machine.succeed("test -e /boot/loader/entries/memtest86.conf")

     

       125
       +
             machine.succeed("test -e /boot/efi/memtest86/memtest.efi")

     

       126
        
           '';

     

       127
        
         };

     

       128
        
       

     
···

       149
        
             imports = [ common ];

     

       150
        
             boot.loader.systemd-boot.memtest86.enable = true;

     

       151
        
             boot.loader.systemd-boot.memtest86.entryFilename = "apple.conf";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       152
        
           };

     

       153
        
       

     

       154
        
           testScript = ''

     

       155
        
             machine.fail("test -e /boot/loader/entries/memtest86.conf")

     

       156
        
             machine.succeed("test -e /boot/loader/entries/apple.conf")

     

       157
       +
             machine.succeed("test -e /boot/efi/memtest86/memtest.efi")

     

       158
        
           '';

     

       159
        
         };

     

       160