From 423a6e7b0d3a6dc990f5f676d584deb053a607667e48e5a1c32fcd30d2031bb6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 17 Feb 2021 10:31:26 +0000 Subject: [PATCH] - Drop use of %systemd_postun in %postun This macro is supposed to operate on units but it was used without passing any parameters. This call was probably used for issuing a daemon-reload but the following calls to %systemd_postun_with_restart imply that already. So let's simply drop it. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1135 --- systemd-mini.changes | 11 +++++++++++ systemd-mini.spec | 4 ++-- systemd.changes | 11 +++++++++++ systemd.spec | 4 ++-- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 2ac6c835..cb3bbe19 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Feb 17 10:30:43 UTC 2021 - Franck Bui + +- Drop use of %systemd_postun in %postun + + This macro is supposed to operate on units but it was used without + passing any parameters. This call was probably used for issuing a + daemon-reload but the following calls to + %systemd_postun_with_restart imply that already. So let's simply + drop it. + ------------------------------------------------------------------- Fri Feb 5 13:02:58 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index e26e3e93..8ee1ccae 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -875,10 +875,10 @@ if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/sys fi %postun -%systemd_postun -# Avoid restarting logind until fixed upstream (issue #1163) +# daemon-reload is implied by %systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service +# Avoid restarting logind until fixed upstream (issue #1163) %pre -n udev%{?mini} # New installations uses the last compat symlink generation number diff --git a/systemd.changes b/systemd.changes index 2ac6c835..cb3bbe19 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Feb 17 10:30:43 UTC 2021 - Franck Bui + +- Drop use of %systemd_postun in %postun + + This macro is supposed to operate on units but it was used without + passing any parameters. This call was probably used for issuing a + daemon-reload but the following calls to + %systemd_postun_with_restart imply that already. So let's simply + drop it. + ------------------------------------------------------------------- Fri Feb 5 13:02:58 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 355fc6c6..5f5c23c6 100644 --- a/systemd.spec +++ b/systemd.spec @@ -873,10 +873,10 @@ if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/sys fi %postun -%systemd_postun -# Avoid restarting logind until fixed upstream (issue #1163) +# daemon-reload is implied by %systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service +# Avoid restarting logind until fixed upstream (issue #1163) %pre -n udev%{?mini} # New installations uses the last compat symlink generation number