summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2022-09-05 16:07:12 -0400
committerGitHub <noreply@github.com>2022-09-05 16:07:12 -0400
commitbb32e97a46920af7b91c62911ee6d440c0eab22a (patch)
tree06f69797a0231074a7d2a49c0bb1dd346aadd44b
parentcd8ac58dc8aed11428967fb53317b75e55e5b12d (diff)
parentadb14b1722798eaa4369a7732d415f8eb3e5c94b (diff)
Merge pull request #189657 from romildo/fix.grub
grub2: fix initrd in menu entries for probed systems
-rw-r--r--pkgs/tools/misc/grub/2.0x.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 4b4141566c1f..58ed620ffd08 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -71,6 +71,13 @@ stdenv.mkDerivation rec {
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b98275138bf4fc250a1c362dfd2c8b1cf2421701";
sha256 = "001m058bsl2pcb0ii84jfm5ias8zgzabrfy6k2cc9w6w1y51ii82";
})
+ # Properly handle multiple initrd paths in 30_os-prober
+ # Remove this patch once a new release is cut
+ (fetchpatch {
+ name = "Properly-handle-multiple-initrd-paths-in-os-prober.patch";
+ url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=000b5cd04fd228f9741f5dca0491636bc0b89eb8";
+ sha256 = "sha256-Mex3qQ0lW7ZCv7ZI7MSSqbylJXZ5RTbR4Pv1+CJ0ciM=";
+ })
];
postPatch = if kbdcompSupport then ''