From 1ad902bf6fcf42dcdabd57c654acd5c9b7413584 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Fri, 5 Feb 2021 13:53:02 -0800
Subject: [PATCH] Ship systemd-oomd-defaults, drop earlyoom

`systemd-oomd-defaults` pulls in `systemd-oomd` and provides a default
configuration and preset.

Also remove `earlyoom` that is previously part of `comps` for
Workstation and KDE.

See https://fedoraproject.org/wiki/Changes/EnableSystemdOomd

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
---
 comps-f34.xml.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/comps-f34.xml.in b/comps-f34.xml.in
index c5eaee77..85fdc0c8 100644
--- a/comps-f34.xml.in
+++ b/comps-f34.xml.in
@@ -610,6 +610,7 @@
       <packagereq type="default">lsvpd</packagereq>
       <packagereq type="default">NetworkManager</packagereq>
       <packagereq type="default">powerpc-utils</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
       <packagereq type="default">zram-generator-defaults</packagereq>
       <packagereq type="optional">dracut-config-generic</packagereq>
       <packagereq type="optional">initial-setup</packagereq>
@@ -3114,7 +3115,6 @@
       <packagereq>cups-pk-helper</packagereq>
       <packagereq>dnfdragora</packagereq>
       <packagereq>dolphin</packagereq>
-      <packagereq>earlyoom</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>glibc-all-langpacks</packagereq>
       <packagereq>gnome-keyring-pam</packagereq>
@@ -5538,7 +5538,6 @@
       <packagereq type="default">dnf-plugins-core</packagereq>
       <packagereq type="default">dos2unix</packagereq>
       <packagereq type="default">dosfstools</packagereq>
-      <packagereq type="default">earlyoom</packagereq>
       <packagereq type="default">ethtool</packagereq>
       <packagereq type="default">exfatprogs</packagereq>
       <packagereq type="default">fedora-chromium-config</packagereq>