From 7cfb2ae59ec2f4eb4da8d1006474bc474d270b446a38f1c9801f7bf7207b19e6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Sep 2023 14:28:05 +0000 Subject: [PATCH] - 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 --- systemd.changes | 7 +++++++ systemd.spec | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/systemd.changes b/systemd.changes index 1375f760..0b369f59 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 22 14:23:38 UTC 2023 - Franck Bui + +- 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 diff --git a/systemd.spec b/systemd.spec index 46843d60..07fe64f0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1017,7 +1017,7 @@ if [ $1 -gt 1 ]; then %systemd_pre getty@.service %systemd_pre systemd-timesyncd.service %systemd_pre systemd-journald-audit.socket - %systemd_pre systemd-userdbd.socket + %systemd_pre systemd-userdbd.service fi %post @@ -1061,7 +1061,7 @@ if [ $1 -gt 1 ]; then %systemd_post getty@.service %systemd_post systemd-timesyncd.service %systemd_post systemd-journald-audit.socket - %systemd_post systemd-userdbd.socket + %systemd_post systemd-userdbd.service fi # 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} %pre journal-remote -%systemd_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%systemd_pre systemd-journal-remote.socket systemd-journal-remote.service +%systemd_pre systemd-journal-gatewayd.service +%systemd_pre systemd-journal-remote.service %systemd_pre systemd-journal-upload.service %post journal-remote # Assume that all files shipped by systemd-journal-remove are owned by root. %sysusers_create systemd-remote.conf -%systemd_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%systemd_post systemd-journal-remote.socket systemd-journal-remote.service +%systemd_post systemd-journal-gatewayd.service +%systemd_post systemd-journal-remote.service %systemd_post systemd-journal-upload.service %preun journal-remote -%systemd_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%systemd_preun systemd-journal-remote.socket systemd-journal-remote.service +%systemd_preun systemd-journal-gatewayd.service +%systemd_preun systemd-journal-remote.service %systemd_preun systemd-journal-upload.service %postun journal-remote -%systemd_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%systemd_postun systemd-journal-remote.socket systemd-journal-remote.service -%systemd_postun systemd-journal-upload.service +%systemd_postun_with_restart systemd-journal-gatewayd.service +%systemd_postun_with_restart systemd-journal-remote.service +%systemd_postun_with_restart systemd-journal-upload.service %endif %if %{with networkd} || %{with resolved}