Unverified Commit d538aa4a authored by Colin's avatar Colin Committed by GitHub
Browse files

nixos/grub: install memtest and other grub.extraFiles correctly when using mirroredBoots (#420861)

parents a3e64d8d 8f0f76a3

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

+12 −3
Original line number Diff line number Diff line
@@ -846,9 +846,18 @@ in 
      environment.systemPackages = mkIf (grub != null) [ grub ];



      boot.loader.grub.extraPrepareConfig = concatStrings (

        mapAttrsToList (n: v: ''

          ${pkgs.coreutils}/bin/install -Dp "${v}" "${efi.efiSysMountPoint}/"${escapeShellArg n}

        '') config.boot.loader.grub.extraFiles

        mapAttrsToList (

          fileName: sourcePath:

          flip concatMapStrings cfg.mirroredBoots (

            args:

            let

              efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;

            in

            ''

              ${pkgs.coreutils}/bin/install -Dp ${escapeShellArg sourcePath} ${escapeShellArg efiSysMountPoint}/${escapeShellArg fileName}

            ''

          )

        ) config.boot.loader.grub.extraFiles

      );



      assertions = [