diff options
| author | Colin Walters <walters@verbum.org> | 2018-01-09 10:22:50 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-09 18:30:59 +0000 |
| commit | 2c2e6799bed208306dba600c8a2de813660ffd93 (patch) | |
| tree | 774393644875ffdb7b71fbf4efc03214bd6db5cb | |
| parent | 9fe6ddbaef9cd34a711c0322197b39e87571aa78 (diff) | |
| download | ostree-2c2e6799bed208306dba600c8a2de813660ffd93.tar.gz | |
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
| -rw-r--r-- | src/boot/grub2/grub2-15_ostree | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/boot/grub2/grub2-15_ostree b/src/boot/grub2/grub2-15_ostree index dfff6e89..0b9bf930 100644 --- a/src/boot/grub2/grub2-15_ostree +++ b/src/boot/grub2/grub2-15_ostree @@ -17,10 +17,14 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # 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 exit 0 fi +if ! test -d /ostree/repo; then + exit 0 +fi # Make sure we're in the right environment if ! test -n "${GRUB_DEVICE}"; then |