commit 5a13c0064085f30acb7e40e1c0fbcbfdde8ddb2a · pyrox.dev/nixpkgs

+25

nixos/tests/systemd-boot-ovmf-broken-fat-driver.patch

···

       1
       1
       +
       From d87a7513c6f2f2824203032ef27caeb84892ed7e Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Will Fancher <elvishjerricco@gmail.com>

     

       3
       3
       +
       Date: Tue, 30 May 2023 16:53:20 -0400

     

       4
       4
       +
       Subject: [PATCH] Intentionally break the fat driver

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        FatPkg/EnhancedFatDxe/ReadWrite.c | 5 +++++

     

       8
       8
       +
        1 file changed, 5 insertions(+)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/FatPkg/EnhancedFatDxe/ReadWrite.c b/FatPkg/EnhancedFatDxe/ReadWrite.c

     

       11
       11
       +
       index 8f525044d1f1..32c62ff7817b 100644

     

       12
       12
       +
       --- a/FatPkg/EnhancedFatDxe/ReadWrite.c

     

       13
       13
       +
       +++ b/FatPkg/EnhancedFatDxe/ReadWrite.c

     

       14
       14
       +
       @@ -216,6 +216,11 @@ FatIFileAccess (

     

       15
       15
       +
          Volume = OFile->Volume;

     

       16
       16
       +
          Task   = NULL;

     

       17
       17
       +
        

     

       18
       18
       +
       +  if (*BufferSize > (10U * 1024U * 1024U)) {

     

       19
       19
       +
       +    IFile->Position += 10U * 1024U * 1024U;

     

       20
       20
       +
       +    return EFI_BAD_BUFFER_SIZE;

     

       21
       21
       +
       +  }

     

       22
       22
       +
       +

     

       23
       23
       +
          //

     

       24
       24
       +
          // Write to a directory is unsupported

     

       25
       25
       +
          //

+25

nixos/tests/systemd-boot.nix

···

       251
       251
        
                 machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/netbootxyz/netboot.xyz.efi")

     

       252
       252
        
           '';

     

       253
       253
        
         };

     

       254
       254
       +
       

     

       255
       255
       +
         # See: [Firmware file size bug] in systemd/default.nix

     

       256
       256
       +
         uefiLargeFileWorkaround = makeTest {

     

       257
       257
       +
           name = "uefi-large-file-workaround";

     

       258
       258
       +
       

     

       259
       259
       +
           nodes.machine = { pkgs, ... }: {

     

       260
       260
       +
             imports = [common];

     

       261
       261
       +
             virtualisation.efi.OVMF = pkgs.OVMF.overrideAttrs (old: {

     

       262
       262
       +
               # This patch deliberately breaks the FAT driver in EDK2 to

     

       263
       263
       +
               # exhibit (part of) the firmware bug that we are testing

     

       264
       264
       +
               # for. Files greater than 10MiB will fail to be read in a

     

       265
       265
       +
               # single Read() call, so systemd-boot will fail to load the

     

       266
       266
       +
               # initrd without a workaround. The number 10MiB was chosen

     

       267
       267
       +
               # because if it were smaller than the kernel size, even the

     

       268
       268
       +
               # LoadImage call would fail, which is not the failure mode

     

       269
       269
       +
               # we're testing for. It needs to be between the kernel size

     

       270
       270
       +
               # and the initrd size.

     

       271
       271
       +
               patches = old.patches or [] ++ [ ./systemd-boot-ovmf-broken-fat-driver.patch ];

     

       272
       272
       +
             });

     

       273
       273
       +
           };

     

       274
       274
       +
       

     

       275
       275
       +
           testScript = ''

     

       276
       276
       +
             machine.wait_for_unit("multi-user.target")

     

       277
       277
       +
           '';

     

       278
       278
       +
         };

     

       254
       279
        
       }

+10

pkgs/os-specific/linux/systemd/default.nix

···

       190
       190
        
           ./0017-inherit-systemd-environment-when-calling-generators.patch

     

       191
       191
        
           ./0018-core-don-t-taint-on-unmerged-usr.patch

     

       192
       192
        
           ./0019-tpm2_context_init-fix-driver-name-checking.patch

     

       193
       193
       +
       

     

       194
       194
       +
           (fetchpatch {

     

       195
       195
       +
             # https://github.com/systemd/systemd/pull/25948

     

       196
       196
       +
             #

     

       197
       197
       +
             # [Firmware file size bug]: Some UEFI firmwares fail on large

     

       198
       198
       +
             # reads. Now that systemd-boot loads initrd itself, systems with

     

       199
       199
       +
             # such firmware won't boot without this fix

     

       200
       200
       +
             url = "https://github.com/systemd/systemd/commit/3ed1d966f00b002ed822ca9de116252bd91fe6c3.patch";

     

       201
       201
       +
             hash = "sha256-pwXrLTScqgnvfddlzUBZpwsoMrvRLcZPp6e4whMcyL4=";

     

       202
       202
       +
           })

     

       193
       203
        
         ] ++ lib.optional stdenv.hostPlatform.isMusl (

     

       194
       204
        
           let

     

       195
       205
        
             oe-core = fetchzip {