From dff66b7a1ba0685b72be42b756dec6cc51c29ea3 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Sep 28 2021 11:47:35 +0000
Subject: Sync presets from RHEL, but prefer dbus-broker


RHEL/CentOS Stream 8 uses dbus-daemon by default, but we want to
use dbus-broker instead for better performance.

---

diff --git a/SOURCES/90-default.preset b/SOURCES/90-default.preset
index f9fa864..29f9400 100644
--- a/SOURCES/90-default.preset
+++ b/SOURCES/90-default.preset
@@ -93,7 +93,7 @@ enable rngd.service
 
 # Other stuff
 enable abrtd.service
-enable abrt-ccpp.service
+enable abrt-journal-core.service
 enable abrt-oops.service
 enable abrt-xorg.service
 enable abrt-vmcore.service
@@ -164,3 +164,41 @@ enable cockpit.socket
 
 # https://fedoraproject.org/wiki/Changes/EnableSystemdOomd
 enable systemd-oomd.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1817591
+enable mlocate-updatedb.timer
+
+# nvme auto connect
+# https://bugzilla.redhat.com/show_bug.cgi?id=1805466
+enable nvmefc-boot-connections.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1683101
+enable nfs-convert.service
+
+# OSTree based systems need to remount /sysroot and
+# /var as rw via ostree-remount.service
+# ignored by non-OSTree based systems
+# https://bugzilla.redhat.com/show_bug.cgi?id=1848453
+enable ostree-remount.service
+
+# enable greenboot services
+# https://bugzilla.redhat.com/show_bug.cgi?id=1935177
+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
+
+# enable dbus services
+# https://bugzilla.redhat.com/show_bug.cgi?id=1941642
+# https://projects.engineering.redhat.com/browse/RHELBLD-6131
+enable dbus.socket
+# Use dbus-broker instead of dbus-daemon
+enable dbus-broker.service
+
+# enable nfs-client.target
+# https://bugzilla.redhat.com/show_bug.cgi?id=1967515
+enable nfs-client.target
diff --git a/SPECS/centos-stream-hyperscale-spin-release.spec b/SPECS/centos-stream-hyperscale-spin-release.spec
index 0e16a18..5c2b98b 100644
--- a/SPECS/centos-stream-hyperscale-spin-release.spec
+++ b/SPECS/centos-stream-hyperscale-spin-release.spec
@@ -5,7 +5,7 @@
 
 Name:           centos-stream-hyperscale-spin-release
 Version:        %{major}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        %{distro} %{variant} release files
 License:        GPLv2
 URL:            https://centos.org
@@ -152,6 +152,10 @@ install -p -m 0644 %{_sourcedir}/*.preset %{buildroot}%{_prefix}/lib/systemd/sys
 
 
 %changelog
+* Tue Sep 28 2021 Neal Gompa <ngompa@centosproject.org> - 8-6
+- Sync systemd presets from RHEL/CS8
+- Use dbus-broker instead of dbus-daemon
+
 * Sun Jun 27 2021 Neal Gompa <ngompa@centosproject.org> - 8-5
 - Fix os-release(5) formatting for Anaconda