fa1bf93c89
This reverts commit 985a14100295c99d0c6d712bfbee0ec52a3a1601. Reverting for now due to some users experiencing no boot entries after upgrading. See for background: https://github.com/ostreedev/ostree/pull/1929 https://discussion.fedoraproject.org/t/boot-entries-gone-after-upgrade/8026 --- Seems silly to revert this by an additional patch, instead of dropping the patch that enabled it in the first place. Though I think this approach has a higher chance of the revert not being accidentally dropped when doing the next rebase.
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From a6476156735990ddf6e4d8cb9a12be4c0295eeca Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Lebon <jonathan@jlebon.com>
|
|
Date: Mon, 7 Oct 2019 10:34:21 -0400
|
|
Subject: [PATCH] Revert "grub2: Exit gracefully if the configuration has BLS
|
|
enabled"
|
|
|
|
This reverts commit 985a14100295c99d0c6d712bfbee0ec52a3a1601.
|
|
|
|
Reverting for now due to some users experiencing no boot entries after
|
|
upgrading. See for background:
|
|
|
|
https://github.com/ostreedev/ostree/pull/1929
|
|
https://discussion.fedoraproject.org/t/boot-entries-gone-after-upgrade/8026
|
|
---
|
|
src/boot/grub2/grub2-15_ostree | 7 -------
|
|
1 file changed, 7 deletions(-)
|
|
|
|
diff --git a/src/boot/grub2/grub2-15_ostree b/src/boot/grub2/grub2-15_ostree
|
|
index 160ac2ca..0b9bf930 100644
|
|
--- a/src/boot/grub2/grub2-15_ostree
|
|
+++ b/src/boot/grub2/grub2-15_ostree
|
|
@@ -26,13 +26,6 @@ if ! test -d /ostree/repo; then
|
|
exit 0
|
|
fi
|
|
|
|
-# Gracefully exit if the grub2 configuration has BLS enabled,
|
|
-# since there is no need to create menu entries in that case.
|
|
-. /etc/default/grub
|
|
-if test ${GRUB_ENABLE_BLSCFG} = "true"; then
|
|
- exit 0
|
|
-fi
|
|
-
|
|
# Make sure we're in the right environment
|
|
if ! test -n "${GRUB_DEVICE}"; then
|
|
echo "This script must be run as a child of grub2-mkconfig" 1>&2
|
|
--
|
|
2.21.0
|
|
|