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
This commit is contained in:
Bjørn Lie 2019-07-16 19:33:04 +00:00 committed by Git OBS Bridge
parent a1b64f7ef3
commit 806aa08f42
2 changed files with 18 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 9 09:26:58 UTC 2019 - Thomas Blume <thomas.blume@suse.com>
- 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 <bjorn.lie@gmail.com>

View File

@ -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