- systemd.spec: when enabling units prefer enabling service units over socket

ones for socket activable services. The services shipped by systemd
  automatically redirect the enablement request to the socket unit.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1441
This commit is contained in:
Franck Bui 2023-09-22 14:28:05 +00:00 committed by Git OBS Bridge
parent 0806632133
commit 121eb704ca
2 changed files with 18 additions and 11 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Sep 22 14:23:38 UTC 2023 - Franck Bui <fbui@suse.com>
- systemd.spec: when enabling units prefer enabling service units over socket
ones for socket activable services. The services shipped by systemd
automatically redirect the enablement request to the socket unit.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 14 06:33:05 UTC 2023 - Franck Bui <fbui@suse.com> Thu Sep 14 06:33:05 UTC 2023 - Franck Bui <fbui@suse.com>

View File

@ -1017,7 +1017,7 @@ if [ $1 -gt 1 ]; then
%systemd_pre getty@.service %systemd_pre getty@.service
%systemd_pre systemd-timesyncd.service %systemd_pre systemd-timesyncd.service
%systemd_pre systemd-journald-audit.socket %systemd_pre systemd-journald-audit.socket
%systemd_pre systemd-userdbd.socket %systemd_pre systemd-userdbd.service
fi fi
%post %post
@ -1061,7 +1061,7 @@ if [ $1 -gt 1 ]; then
%systemd_post getty@.service %systemd_post getty@.service
%systemd_post systemd-timesyncd.service %systemd_post systemd-timesyncd.service
%systemd_post systemd-journald-audit.socket %systemd_post systemd-journald-audit.socket
%systemd_post systemd-userdbd.socket %systemd_post systemd-userdbd.service
fi fi
# Run the hacks/fixups to clean up the old stuff left by (very) old versions of # Run the hacks/fixups to clean up the old stuff left by (very) old versions of
@ -1160,26 +1160,26 @@ fi
%if %{with journal_remote} %if %{with journal_remote}
%pre journal-remote %pre journal-remote
%systemd_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %systemd_pre systemd-journal-gatewayd.service
%systemd_pre systemd-journal-remote.socket systemd-journal-remote.service %systemd_pre systemd-journal-remote.service
%systemd_pre systemd-journal-upload.service %systemd_pre systemd-journal-upload.service
%post journal-remote %post journal-remote
# Assume that all files shipped by systemd-journal-remove are owned by root. # Assume that all files shipped by systemd-journal-remove are owned by root.
%sysusers_create systemd-remote.conf %sysusers_create systemd-remote.conf
%systemd_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %systemd_post systemd-journal-gatewayd.service
%systemd_post systemd-journal-remote.socket systemd-journal-remote.service %systemd_post systemd-journal-remote.service
%systemd_post systemd-journal-upload.service %systemd_post systemd-journal-upload.service
%preun journal-remote %preun journal-remote
%systemd_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %systemd_preun systemd-journal-gatewayd.service
%systemd_preun systemd-journal-remote.socket systemd-journal-remote.service %systemd_preun systemd-journal-remote.service
%systemd_preun systemd-journal-upload.service %systemd_preun systemd-journal-upload.service
%postun journal-remote %postun journal-remote
%systemd_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %systemd_postun_with_restart systemd-journal-gatewayd.service
%systemd_postun systemd-journal-remote.socket systemd-journal-remote.service %systemd_postun_with_restart systemd-journal-remote.service
%systemd_postun systemd-journal-upload.service %systemd_postun_with_restart systemd-journal-upload.service
%endif %endif
%if %{with networkd} || %{with resolved} %if %{with networkd} || %{with resolved}