[rpms/fedora-release] f45: Merge #80 `Add 'disable *' default preset for user units`

[rpms/fedora-release] f45: Merge #80 `Add 'disable *' default preset for user units`

[Stephen Gallagher]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 4d4fd53ae0c77475a8e5b3f498d84b3330349dcb
            Author : Stephen Gallagher <sgallagh@fedoraproject.org>
            Date   : 2020-02-07T14:29:57+00:00
            Stats  : +16/-1 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/4d4fd53ae0c77475a8e5b3f498d84b3330349dcb?branch=f45

            Log:
            Merge #80 `Add 'disable *' default preset for user units`

Signed-off-by: Stephen Gallagher <sgallagh@fedoraproject.org>

---
diff --git a/90-default-user.preset b/90-default-user.preset
index 3c09e26..7280418 100644
--- a/90-default-user.preset
+++ b/90-default-user.preset
@@ -13,3 +13,8 @@ enable pipewire.socket
 # Enable the session agent for snaps
 # https://bugzilla.redhat.com/show_bug.cgi?id=1734371
 enable snapd.session-agent.socket
+
+# https://src.fedoraproject.org/rpms/fedora-release/pull-request/80
+enable obex.service
+enable grub-boot-success.timer
+enable pulseaudio.socket

diff --git a/fedora-release.spec b/fedora-release.spec
index d01fc26..bdba221 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -14,7 +14,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        32
-Release:        0.4
+Release:        0.5
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -498,7 +498,9 @@ install -pm 0644 %{SOURCE2} licenses/Fedora-Legal-README.txt
 install -Dm0644 %{SOURCE10} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
 install -Dm0644 %{SOURCE11} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
 install -Dm0644 %{SOURCE12} -t %{buildroot}%{_prefix}/lib/systemd/user-preset/
+# The same file is installed in two places with identical contents
 install -Dm0644 %{SOURCE13} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -Dm0644 %{SOURCE13} -t %{buildroot}%{_prefix}/lib/systemd/user-preset/
 
 # Fedora CoreOS
 install -Dm0644 %{SOURCE22} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
@@ -553,6 +555,7 @@ echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant
 %attr(0644,root,root) %{_rpmconfigdir}/macros.d/macros.dist
 %dir %{_prefix}/lib/systemd/user-preset/
 %{_prefix}/lib/systemd/user-preset/90-default-user.preset
+%{_prefix}/lib/systemd/user-preset/99-default-disable.preset
 %dir %{_prefix}/lib/systemd/system-preset/
 %{_prefix}/lib/systemd/system-preset/85-display-manager.preset
 %{_prefix}/lib/systemd/system-preset/90-default.preset
@@ -643,6 +646,9 @@ echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant
 
 
 %changelog
+* Fri Feb  7 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 32-0.5
+- Add 'disable *' default preset for user units (#1468501)
+
 * Wed Oct 30 2019 Peter Robinson <pbrobinson@fedoraproject.org> 32-0.4
 - Drop clevis IoT defaults change
 

diff --git a/80-workstation.preset b/80-workstation.preset
index 7e250fb..851876b 100644
--- a/80-workstation.preset
+++ b/80-workstation.preset
@@ -13,3 +13,7 @@ disable sshd.service
 enable cups.socket
 enable cups.path
 disable cups.service
+
+# enable earlyoom by default on workstation
+# https://pagure.io/fedora-workstation/issue/119
+enable earlyoom.service