From adb14b1722798eaa4369a7732d415f8eb3e5c94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 3 Sep 2022 19:27:25 -0300 Subject: [PATCH] grub2: fix initrd in menu entries for probed systems Fix an issue where initrd images are separated by ^ instead of space. This was ocurring with menu entries for probed linux operating systems. See https://savannah.gnu.org/bugs/?47681 --- pkgs/tools/misc/grub/2.0x.nix | 7 +++++++ 1 file changed, 7 insertions(+) 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 ''