From f5049c143cbb2a6ad2e78ed0152b750dd15311bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Mon, 5 Jun 2023 15:50:30 +0200
Subject: [PATCH] distro/fedora: redo package set for qcow2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Our package set was quite outdated. Let's sync it with the Fedora Cloud
kickstart:
https://pagure.io/fedora-kickstarts/blob/c3b160775a3b159f949ba931dcb68e520a460e12/f/fedora-cloud-base.ks

I manually compared built images and our image contain kernel, kernel-modules
and linux-firmware above the official package set:

- removing kernel and kernel-modules is tricky, because we always assume that
  the default kernel is called kernel.
- removing linux-firmware is a big hack, since it breaks the RPM dependencies
  inside the image.

Thus, let's ignore these for now, it's definitely better than before.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 internal/distro/fedora/package_sets.go | 32 +++-----------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/internal/distro/fedora/package_sets.go b/internal/distro/fedora/package_sets.go
index 42dec877a..65f57d023 100644
--- a/internal/distro/fedora/package_sets.go
+++ b/internal/distro/fedora/package_sets.go
@@ -11,48 +11,22 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/rpmmd"
 )
 
-func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
+func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
 	return rpmmd.PackageSet{
-		Include: []string{
-			"@core",
-			"chrony",
-			"langpacks-en",
-			"libxcrypt-compat",
-			"checkpolicy",
-			"net-tools",
-		},
-		Exclude: []string{
-			"dracut-config-rescue",
-			"geolite2-city",
-			"geolite2-country",
-			"zram-generator-defaults",
-		},
-	}
-}
-
-func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
-	ps := rpmmd.PackageSet{
 		Include: []string{
 			"@Fedora Cloud Server",
-			"chrony",
-			"systemd-udev",
+			"chrony", // not mentioned in the kickstart, anaconda pulls it when setting the timezone
 			"langpacks-en",
+			"qemu-guest-agent",
 		},
 		Exclude: []string{
 			"dracut-config-rescue",
-			"etables",
 			"firewalld",
 			"geolite2-city",
 			"geolite2-country",
-			"gobject-introspection",
 			"plymouth",
-			"zram-generator-defaults",
-			"grubby-deprecated",
-			"extlinux-bootloader",
 		},
 	}
-
-	return ps
 }
 
 func vhdCommonPackageSet(t *imageType) rpmmd.PackageSet {