summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2019-10-24 15:21:17 +0000
committerColin Walters <walters@verbum.org>2019-10-24 17:49:53 +0000
commit650d6252af4ddd9fa82d41e934a221b82c694233 (patch)
tree4c025d1c81bfb11b9c3d907a0e636e375e36a46a
parent69b604722da82255f6050f633218130fcac2612b (diff)
downloadostree-650d6252af4ddd9fa82d41e934a221b82c694233.tar.gz
Revert "grub2: Exit gracefully if the configuration has BLS enabled"
This reverts commit 985a14100295c99d0c6d712bfbee0ec52a3a1601. It turned out that some people have old bootloaders, and hence get the "no entries" problem. That's much, much much worse than double entries.
-rw-r--r--src/boot/grub2/grub2-15_ostree7
1 files changed, 0 insertions, 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