diff --git a/earlyoom-fedora-options.patch b/earlyoom-fedora-options.patch deleted file mode 100644 index 6a9ec4a..0000000 --- a/earlyoom-fedora-options.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e192c1a484834e63184c2246c9d5c66e3d4911f5 Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Mon, 23 Mar 2020 11:27:29 +0100 -Subject: [PATCH] Use Fedora launch options. - -More info and discussion: -https://pagure.io/fedora-workstation/issue/119. ---- - earlyoom.default | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/earlyoom.default b/earlyoom.default -index fa8b9cc..0ffb8d2 100644 ---- a/earlyoom.default -+++ b/earlyoom.default -@@ -2,7 +2,7 @@ - # /etc/init.d/earlyoom or by systemd from earlyoom.service. - - # Options to pass to earlyoom --EARLYOOM_ARGS="-r 3600" -+EARLYOOM_ARGS="-r 0 -m 4 -M 409600 --prefer '^Web Content$' --avoid '^(dnf|packagekitd|gnome-shell|gnome-session-c|gnome-session-b|lightdm|sddm|sddm-helper|gdm|gdm-wayland-ses|gdm-session-wor|gdm-x-session|Xorg|Xwayland|systemd|systemd-logind|dbus-daemon|dbus-broker|cinnamon|cinnamon-sessio|kwin_x11|kwin_wayland|plasmashell|ksmserver|plasma_session|startplasma-way|xfce4-session|mate-session|marco|lxqt-session|openbox|cryptsetup)$'" - - # Examples: - --- -2.29.2 - diff --git a/earlyoom.conf b/earlyoom.conf new file mode 100644 index 0000000..1f7eb86 --- /dev/null +++ b/earlyoom.conf @@ -0,0 +1,6 @@ +# These default settings were approved by the Fedora Workstation SIG: +# https://pagure.io/fedora-workstation/issue/119 + +EARLYOOM_ARGS="-r 0 -m 4 -M 409600 --prefer '^(Web Content|Isolated Web Co)$' --avoid '^(dnf|packagekitd|gnome-shell|gnome-session-c|gnome-session-b|lightdm|sddm|sddm-helper|gdm|gdm-wayland-ses|gdm-session-wor|gdm-x-session|Xorg|Xwayland|systemd|systemd-logind|dbus-daemon|dbus-broker|cinnamon|cinnamon-sessio|kwin_x11|kwin_wayland|plasmashell|ksmserver|plasma_session|startplasma-way|xfce4-session|mate-session|marco|lxqt-session|openbox|cryptsetup)$'" + +# More documentation at `man earlyoom` or `earlyoom -h`. diff --git a/earlyoom.spec b/earlyoom.spec index c82b0d9..5bd43d5 100644 --- a/earlyoom.spec +++ b/earlyoom.spec @@ -2,15 +2,13 @@ Name: earlyoom Version: 1.6.2 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT URL: https://github.com/rfjakob/%{name} Summary: Early OOM Daemon for Linux Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz - -# https://pagure.io/fedora-workstation/issue/119 -Patch0: %{name}-fedora-options.patch +Source1: %{name}.conf %{?systemd_requires} BuildRequires: systemd @@ -28,6 +26,7 @@ Percentages are configured through the configuration file. %prep %autosetup -p1 +cp -f %{SOURCE1} %{name}.default sed -e '/systemctl/d' -i Makefile %build @@ -62,6 +61,10 @@ systemctl --no-reload preset %{name}.service &>/dev/null || : %config(noreplace) %{_sysconfdir}/default/%{name} %changelog +* Wed Feb 02 2022 Vitaly Zaitsev - 1.6.2-7 +- Extracted configuration file to earlyoom.conf. +- Adjusted priority of "Isolated Web Co" processes. + * Thu Jan 20 2022 Fedora Release Engineering - 1.6.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild