packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2044 from martinezjavier/duplicated-entries 

grub2: Don't add menu entries if GRUB supports parsing BLS snippets
This commit is contained in:
OpenShift Merge Robot 2020-04-07 15:54:08 +02:00 committed by GitHub
parent 0638d1ea86 768eee87f6
commit 4a57204c60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/boot/grub2/grub2-15_ostree
View File

@ -26,6 +26,16 @@ if ! test -d /ostree/repo; then
exit 0 exit 0
fi fi
# Gracefully exit if the grub2 configuration has BLS enabled,
# and the installed version has support for the blscfg module.
# Since there is no need to create menu entries for that case.
# See: https://src.fedoraproject.org/rpms/grub2/c/7c2bab5e98d
. /etc/default/grub
if test -f /boot/grub2/.grub2-blscfg-supported && \
test "${GRUB_ENABLE_BLSCFG}" = "true"; then
exit 0
fi
# Make sure we're in the right environment # Make sure we're in the right environment
if ! test -n "${GRUB_DEVICE}"; then if ! test -n "${GRUB_DEVICE}"; then
echo "This script must be run as a child of grub2-mkconfig" 1>&2 echo "This script must be run as a child of grub2-mkconfig" 1>&2