PR#80: Add 'disable *' default preset for user units - rpms/fedora-release

rpms / fedora-release

#80 Add 'disable *' default preset for user units

Merged 3 years ago by sgallagh. Opened 4 years ago by zbyszek.

rpms/ zbyszek/fedora-release user-presets into master

Enable pulseaudio.socket in user presets

Zbigniew Jędrzejewski-Szmek • 3 years ago

da7bbdc

Enable grub-boot-success.timer in user presets

Zbigniew Jędrzejewski-Szmek • 3 years ago

26ee3ce

Enable obex.service in user presets

Zbigniew Jędrzejewski-Szmek • 3 years ago

01a1dae

Add "disable *" default preset for user units

Zbigniew Jędrzejewski-Szmek • 3 years ago

5a06de2

90-default-user.preset

file modified

		`@@ -13,3 +13,8 @@`
		`# 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`

fedora-release.spec

file modified

+7 -1

		`@@ -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 -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 @@`
		`%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 @@`


		`%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`

no initial comment

1 new commit added

Enable grub-boot-success.timer in user presets

4 years ago

1 new commit added

Enable pulseaudio.socket in user presets

4 years ago

kevin commented 4 years ago

Can you rebase this if its still wanted?

sgallagh commented 4 years ago

@zbyszek Is this still desired?

sgallagh commented 4 years ago

@zbyszek Pinging one more time, then I'll close this in a couple days if there is no response.

Pull-Request has been closed by sgallagh

4 years ago

Pull-Request has been reopened by zbyszek

3 years ago

rebased onto a606a062f9040a48187e4a4a4cf137b48477fe14

3 years ago

zbyszek commented 3 years ago

This got officially approved in https://fedoraproject.org/wiki/Changes/Systemd_presets_for_user_units, please merge.

sgallagh commented on line 14 of fedora-release.spec 3 years ago

Would you mind including a comment here to state why %{SOURCE13} is used in both places? I had to go check to see that the file contents were just disable *.

rebased onto 5a06de2

3 years ago

zbyszek commented 3 years ago

Updated.

sgallagh commented 3 years ago

LGTM

Pull-Request has been merged by sgallagh

3 years ago