From f74c7196dcb1dc262d1087220a97acfafc988ae1 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Nov 29 2018 08:45:17 +0000
Subject: Move grubby from @core to @standard


With BLS the grubby tool isn't used when new kernels are installed, since
the bootloader config files don't have to be edited anymore. But u-boot
doesn't have BLS support yet, so on ARMv7 installs the old grubby tool
needs to be installed.

That's why commit 4c2694e1d8b ("Move grubby and grubby-deprecated from
@core to @arm-tools") moved the grubby-depracted package to @arm-tools.

But it also moved the grubby package and while this isn't needed during
install on other arches, it may be useful for users to manage their boot
menu entries.

Suggested-by: Adam Williamson <awilliam@redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

---

diff --git a/comps-f30.xml.in b/comps-f30.xml.in
index fcef129..efa1d34 100644
--- a/comps-f30.xml.in
+++ b/comps-f30.xml.in
@@ -157,7 +157,6 @@
     <packagelist>
       <packagereq>arm-image-installer</packagereq>
       <packagereq>cloud-utils-growpart</packagereq>
-      <packagereq>grubby</packagereq>
       <packagereq>grubby-deprecated</packagereq>
       <packagereq>uboot-images-armv7</packagereq>
       <packagereq>uboot-images-armv8</packagereq>
@@ -5900,6 +5899,7 @@
       <packagereq>fpaste</packagereq>
       <packagereq>fprintd-pam</packagereq>
       <packagereq>gnupg2</packagereq>
+      <packagereq>grubby</packagereq>
       <packagereq>hunspell</packagereq>
       <packagereq>iptstate</packagereq>
       <packagereq>irqbalance</packagereq>