From 8609970ea8f178dcf68fbc5a2c1f7d917f35619b5c1fac2945540239d839ae1b Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 17 Feb 2022 18:53:00 +0000 Subject: [PATCH] - Drop enablement symlink migration support of SysV init scripts This was announced here: https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/3ERUP5ZZJ6PPA36L3HVN46BH6U6JL74O/ OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=76 --- macros.systemd | 5 +---- systemd-rpm-macros.changes | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/macros.systemd b/macros.systemd index 176fc3c..306fa07 100644 --- a/macros.systemd +++ b/macros.systemd @@ -91,8 +91,7 @@ Suggests: systemd \ %service_add_pre() \ if [ -x /usr/bin/systemctl ]; then \ for service in %{?*} ; do \ - if [ ! -e "/usr/lib/systemd/system/$service" ] && \ - [ ! -e "/etc/init.d/${service%.*}" ]; then \ + if [ ! -e "/usr/lib/systemd/system/$service" ]; then \ mkdir -p /run/systemd/rpm/needs-preset \ touch "/run/systemd/rpm/needs-preset/$service" \ fi \ @@ -108,8 +107,6 @@ if [ -x /usr/bin/systemctl ]; then \ if [ -e "/run/systemd/rpm/needs-preset/$service" ]; then \ /usr/bin/systemctl preset "$service" || : \ rm "/run/systemd/rpm/needs-preset/$service" || : \ - else \ - /usr/lib/systemd/systemd-sysv-convert --apply %{?*} || : \ fi \ done \ fi \ diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index d974674..8af448f 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 17 18:46:25 UTC 2022 - Franck Bui + +- Drop enablement symlink migration support of SysV init scripts + + This was announced here: + https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/3ERUP5ZZJ6PPA36L3HVN46BH6U6JL74O/ + ------------------------------------------------------------------- Wed Jan 19 08:28:16 UTC 2022 - Franck Bui