mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 07:44:52 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
25 lines
962 B
Diff
25 lines
962 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jan Hlavac <jhlavac@redhat.com>
|
|
Date: Tue, 10 Apr 2018 16:07:36 +0200
|
|
Subject: [PATCH] BLS: Fix grub2-switch-to-blscfg on non-EFI machines
|
|
|
|
On the non-EFI machines the grub2-switch-to-blscfg script places the BLS
|
|
snippets into the /boot directory. But the right location is
|
|
/boot/loader/entries.
|
|
---
|
|
util/grub-switch-to-blscfg.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
|
|
index 3ae5e4ea8d0..f740b8f4d03 100644
|
|
--- a/util/grub-switch-to-blscfg.in
|
|
+++ b/util/grub-switch-to-blscfg.in
|
|
@@ -44,7 +44,7 @@ if [ -d /sys/firmware/efi/efivars/ ]; then
|
|
else
|
|
startlink=/etc/grub2.cfg
|
|
grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
|
|
- blsdir=`echo "/@bootdirname@" | sed 's,//*,/,g'`
|
|
+ blsdir=`echo "/@bootdirname@/loader/entries" | sed 's,//*,/,g'`
|
|
fi
|
|
|
|
backupsuffix=.bak
|