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

Merge pull request #1955 from cgwalters/revert-grub2-exit 

Revert grub2 exit, add new grub2: Honor /boot/.grub2-bls-enabled
This commit is contained in:
OpenShift Merge Robot 2019-10-25 16:07:25 +02:00 committed by GitHub
parent 4b496264b8 650d6252af
commit bd3f24e6c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,13 +26,6 @@ if ! test -d /ostree/repo; then
exit 0 exit 0
fi 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 # 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