From f81bee19f7562682535f8fd7847483f0044ef265 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Sep 26 2019 14:26:01 +0000
Subject: Drop ostree-grub2


We switched to blscfg now, so we don't need to manually generate
entries. Otherwise, we'll just end up with duplicate GRUB2 menu entries.

Note that the `blscfg` code comes from `10_linux` and we're still
running `grub2-mkconfig`. Which is good actually, because it means that
machines on previous versions will be able to safely update and
transparently switch to `blscfg`.

Drop the "sync with fedora-atomic-host.json" bit since FAH is forever
stuck in the past now at f29.

See: https://bugzilla.redhat.com/show_bug.cgi?id=1751272#c27

---

diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 7e90f6d..256d287 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -49,24 +49,19 @@ check-groups: { type: file, filename: group }
 
 default_target: graphical.target
 
-# Keep this in sync with fedora-atomic-host.json from fedora-atomic
 packages-aarch64:
   - grub2-efi
-  - ostree-grub2
   - efibootmgr
   - shim
 packages-armhfp:
   - extlinux-bootloader
 packages-ppc64:
   - grub2
-  - ostree-grub2
 packages-ppc64le:
   - grub2
-  - ostree-grub2
 packages-x86_64:
   - grub2
   - grub2-efi-x64
-  - ostree-grub2
   - efibootmgr
   - shim
   - microcode_ctl