From aeb996af0a53486c0596001a26a54479a3265274 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 04 2025 16:30:23 +0000
Subject: common: Add selected packages from anaconda-tools comps group


Import packages from this group currently missing in Atomic Desktops. In
the future, we may rely on the comps group once we have cleaned it up.

Drop bcache-tools from kinoite-common. It is no longer (not sure if it
ever was) part of the anaconda-tools group.

See: https://gitlab.com/fedora/ostree/sig/-/issues/5

---

diff --git a/common.yaml b/common.yaml
index 3bdacc4..d6f7663 100644
--- a/common.yaml
+++ b/common.yaml
@@ -52,7 +52,6 @@ packages:
   - git-core
   # Explicitely add Git docs
   - git-core-doc
-  - lvm2
   # Required for compatibility with old bootloaders until we have bootupd
   # See https://github.com/fedora-silverblue/issue-tracker/issues/120
   - ostree-grub2
@@ -76,9 +75,6 @@ packages:
   # Flatpak support
   - flatpak
   - xdg-desktop-portal
-  # HFS filesystem tools for Apple hardware
-  # See https://github.com/projectatomic/rpm-ostree/issues/1380
-  - hfsplus-tools
   # Contains default ostree remote config to be used on client's
   # system for fetching ostree update
   - fedora-repos-ostree
@@ -92,6 +88,14 @@ packages:
   # See: https://gitlab.com/fedora/ostree/sig/-/issues/50
   - fuse
   - fuse-libs
+  # Selected packages from the anaconda-tools group. See: https://gitlab.com/fedora/ostree/sig/-/issues/5
+  - dosfstools
+  - lvm2
+  - nvme-cli
+  - xfsprogs
+  # HFS filesystem tools for Apple hardware
+  # See https://github.com/projectatomic/rpm-ostree/issues/1380
+  - hfsplus-tools
 
 selinux: true
 documentation: true
diff --git a/kinoite-common.yaml b/kinoite-common.yaml
index 06e8c12..19cea45 100644
--- a/kinoite-common.yaml
+++ b/kinoite-common.yaml
@@ -26,7 +26,6 @@ packages:
   - kamera
   # Make sure that previous Anaconda dependencies are kept in the image
   # See: https://pagure.io/fedora-kde/SIG/issue/243
-  - bcache-tools
   - mobile-broadband-provider-info
   # Make sure that modem support is installed
   - NetworkManager-ppp