diff --git a/macros.systemd b/macros.systemd index 81b652d..4a5c163 100644 --- a/macros.systemd +++ b/macros.systemd @@ -75,7 +75,8 @@ if [ $1 -gt 1 -a -x /usr/bin/systemctl ]; then \ # update (see bsc#1059627) \ rm -f "/run/rpm-%{name}-update-$service-new-in-upgrade" \ \ - if [ ! -e "/usr/lib/systemd/system/$service" ]; then \ + if [ ! -e "/usr/lib/systemd/system/$service" ] && \ + [ ! -e "/etc/init.d/${service%.*}" ]; then \ touch "/run/rpm-%{name}-update-$service-new-in-upgrade" \ fi \ done \ diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index bd13ae5..b961b13 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 9 11:36:56 UTC 2020 - Franck Bui + +- Dont apply presets when migrating from a disabled initscript (bsc#1178481) + ------------------------------------------------------------------- Mon Nov 9 08:47:04 UTC 2020 - Franck Bui