From 7c67f0f71a2a4e64264e925977645e306816a3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 27 Oct 2014 21:34:09 -0500 Subject: [PATCH] rpm: add user macros --- src/core/macros.systemd.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in index 333f222de0..bea6ef1da3 100644 --- a/src/core/macros.systemd.in +++ b/src/core/macros.systemd.in @@ -43,6 +43,8 @@ if [ $1 -eq 1 ] ; then \ fi \ %{nil} +%systemd_user_post() %systemd_post --user --global %{?*} + %systemd_preun() \ if [ $1 -eq 0 ] ; then \ # Package removal, not upgrade \ @@ -51,10 +53,19 @@ if [ $1 -eq 0 ] ; then \ fi \ %{nil} +%systemd_user_preun() \ +if [ $1 -eq 0 ] ; then \ + # Package removal, not upgrade \ + systemctl --no-reload --user --global disable %{?*} > /dev/null 2>&1 || : \ +fi \ +%{nil} + %systemd_postun() \ systemctl daemon-reload >/dev/null 2>&1 || : \ %{nil} +%systemd_user_postun() %{nil} + %systemd_postun_with_restart() \ systemctl daemon-reload >/dev/null 2>&1 || : \ if [ $1 -ge 1 ] ; then \ @@ -63,6 +74,8 @@ if [ $1 -ge 1 ] ; then \ fi \ %{nil} +%systemd_user_postun_with_restart() %{nil} + %udev_hwdb_update() \ udevadm hwdb --update >/dev/null 2>&1 || : \ %{nil}