From 8f8309a6c3e4dbeb7f52bfeecf689eee8215b838 Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Tue, 30 Nov 2021 11:53:24 -0700
Subject: [PATCH] sync with upstream and lookahead

---
 SOURCES/90-default.preset    | 14 +++++++++++++-
 SOURCES/90-default.preset.lh | 14 +++++++++++++-
 SPECS/rocky-release.spec     | 13 +++++++------
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/SOURCES/90-default.preset b/SOURCES/90-default.preset
index 3ad5d81..14aa72f 100644
--- a/SOURCES/90-default.preset
+++ b/SOURCES/90-default.preset
@@ -131,6 +131,8 @@ enable upower.service
 enable udisks2.service
 enable packagekit-offline-update.service
 enable PackageKit.service
+# https://bugzilla.redhat.com/show_bug.cgi?id=2011240
+enable power-profiles-daemon.service
 
 # Initial Setup reconfiguration service
 enable initial-setup-reconfiguration.service
@@ -197,6 +199,16 @@ enable iscsid.socket
 enable iscsiuio.socket
 enable iscsi-onboot.service
 
-# Enable preset for low-memory-monitor
+# Enable greenboot
+# https://bugzilla.redhat.com/show_bug.cgi?id=2005552
+enable greenboot-grub2-set-counter.service
+enable greenboot-grub2-set-success.service
+enable greenboot-healthcheck.service
+enable greenboot-rpm-ostree-grub2-check-fallback.service
+enable greenboot-status.service
+enable greenboot-task-runner.service
+enable redboot-auto-reboot.service
+enable redboot-task-runner.service
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=2013299
 enable low-memory-monitor.service
diff --git a/SOURCES/90-default.preset.lh b/SOURCES/90-default.preset.lh
index 3ad5d81..14aa72f 100644
--- a/SOURCES/90-default.preset.lh
+++ b/SOURCES/90-default.preset.lh
@@ -131,6 +131,8 @@ enable upower.service
 enable udisks2.service
 enable packagekit-offline-update.service
 enable PackageKit.service
+# https://bugzilla.redhat.com/show_bug.cgi?id=2011240
+enable power-profiles-daemon.service
 
 # Initial Setup reconfiguration service
 enable initial-setup-reconfiguration.service
@@ -197,6 +199,16 @@ enable iscsid.socket
 enable iscsiuio.socket
 enable iscsi-onboot.service
 
-# Enable preset for low-memory-monitor
+# Enable greenboot
+# https://bugzilla.redhat.com/show_bug.cgi?id=2005552
+enable greenboot-grub2-set-counter.service
+enable greenboot-grub2-set-success.service
+enable greenboot-healthcheck.service
+enable greenboot-rpm-ostree-grub2-check-fallback.service
+enable greenboot-status.service
+enable greenboot-task-runner.service
+enable redboot-auto-reboot.service
+enable redboot-task-runner.service
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=2013299
 enable low-memory-monitor.service
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 1705ca9..02b3b40 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -250,13 +250,14 @@ install -d -m 0755 %{buildroot}%{_prefix}/lib/sysctl.d/
 install -m 0644 %{SOURCE304} %{buildroot}/%{_prefix}/lib/sysctl.d/
 
 # lookahead replacements
+# TODO: Is there a cleaner way?
 %if 0%{?rllh}
-install -m 0644 %{SOURCE400} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
-install -m 0644 %{SOURCE401} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
-install -m 0644 %{SOURCE402} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
-install -m 0644 %{SOURCE403} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
-install -m 0644 %{SOURCE403} %{buildroot}/%{_prefix}/lib/systemd/user-preset/
-install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/
+install -m 0644 %{SOURCE400} %{buildroot}/%{_prefix}/lib/systemd/system-preset/85-display-manager.preset
+install -m 0644 %{SOURCE401} %{buildroot}/%{_prefix}/lib/systemd/system-preset/90-default.preset
+install -m 0644 %{SOURCE402} %{buildroot}/%{_prefix}/lib/systemd/system-preset/90-default-user.preset
+install -m 0644 %{SOURCE403} %{buildroot}/%{_prefix}/lib/systemd/system-preset/99-default-disable.preset
+install -m 0644 %{SOURCE403} %{buildroot}/%{_prefix}/lib/systemd/user-preset/99-default-disable.preset
+install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
 %endif
 
 # systemd section