summary refs log tree commit diff
path: root/pkgs/tools/misc/grub
diff options
context:
space:
mode:
authorJosé Romildo <malaquias@gmail.com>2022-09-03 19:27:25 -0300
committerJosé Romildo <malaquias@gmail.com>2022-09-05 09:51:04 -0300
commitadb14b1722798eaa4369a7732d415f8eb3e5c94b (patch)
treeaac962079701e2cc757fc173d018b7a68c290fa6 /pkgs/tools/misc/grub
parent91e1f0cd62ca3231a82a88209fdf3f66c6d4c310 (diff)
downloadnixpkgs-adb14b1722798eaa4369a7732d415f8eb3e5c94b.tar
nixpkgs-adb14b1722798eaa4369a7732d415f8eb3e5c94b.tar.gz
nixpkgs-adb14b1722798eaa4369a7732d415f8eb3e5c94b.tar.bz2
nixpkgs-adb14b1722798eaa4369a7732d415f8eb3e5c94b.tar.lz
nixpkgs-adb14b1722798eaa4369a7732d415f8eb3e5c94b.tar.xz
nixpkgs-adb14b1722798eaa4369a7732d415f8eb3e5c94b.tar.zst
nixpkgs-adb14b1722798eaa4369a7732d415f8eb3e5c94b.zip
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
Diffstat (limited to 'pkgs/tools/misc/grub')
-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 4b4141566c1..58ed620ffd0 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 ''