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

grub2: Exit gracefully if there's no system ostree repository 

Apparently there testing systems that literally install *all*
packages.  Having `ostree-grub2` currently causes grub2 to fail
on a non-ostree managed system.  Let's just gracefully exit
if there's no system repository.

https://bugzilla.redhat.com/show_bug.cgi?id=1532668

Closes: #1399
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-01-09 10:22:50 -05:00 committed by Atomic Bot
parent 9fe6ddbaef
commit 2c2e6799be
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,14 @@
# Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
# Gracefully exit if ostree is not installed # Gracefully exit if ostree is not installed, or there's
# no system repository initialized.
if ! which ostree >/dev/null 2>/dev/null; then if ! which ostree >/dev/null 2>/dev/null; then
exit 0 exit 0
fi fi
if ! test -d /ostree/repo; 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