From 806aa08f42c3cd064cd75a39d790dc685ea25d4cc27a16823427d96f131bfc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 16 Jul 2019 19:33:04 +0000 Subject: [PATCH] Accepting request 715599 from home:tsaupe:branches:openSUSE:Factory:udisks2 don't call systemd uninstall macro for clean-mount-point@.service template (boo#1139996) OBS-URL: https://build.opensuse.org/request/show/715599 OBS-URL: https://build.opensuse.org/package/show/Base:System/udisks2?expand=0&rev=79 --- udisks2.changes | 6 ++++++ udisks2.spec | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/udisks2.changes b/udisks2.changes index a54d6ea..e1ac03d 100644 --- a/udisks2.changes +++ b/udisks2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 9 09:26:58 UTC 2019 - Thomas Blume + +- don't call systemd uninstall macro for clean-mount-point@.service + template (boo#1139996) + ------------------------------------------------------------------- Thu Jun 13 18:06:34 UTC 2019 - Bjørn Lie diff --git a/udisks2.spec b/udisks2.spec index a9b2e5f..b99e9cb 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -246,11 +246,21 @@ ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name} %preun -n %{name} %service_del_preun udisks2.service -%service_del_preun clean-mount-point@.service +SERVICES=$(systemctl show --property=Names clean-mount-point@*.service | sed -e 's/Names=//' -e '/^$/d') +if [ -n "$SERVICES" ]; then + for service in $SERVICES; do + %service_del_preun $service + done +fi %postun -n %{name} %service_del_postun udisks2.service -%service_del_postun clean-mount-point@.service +SERVICES=$(systemctl show --property=Names clean-mount-point@*.service | sed -e 's/Names=//' -e '/^$/d') +if [ -n "$SERVICES" ]; then + for service in $SERVICES; do + %service_del_postun $service + done +fi %pre -n %{libudisks}_zram %service_add_pre zram-setup@.service