chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: rearrange log function naming
[elogind.git]
/
src
/
core
/
macros.systemd.in
diff --git
a/src/core/macros.systemd.in
b/src/core/macros.systemd.in
index 333f222de086aa2e5b48341f68c5d82cbc8cf5b9..bea6ef1da3cbdf93f351cfafced28a020e0c07c5 100644
(file)
--- a/
src/core/macros.systemd.in
+++ b/
src/core/macros.systemd.in
@@
-43,6
+43,8
@@
if [ $1 -eq 1 ] ; then \
fi \
%{nil}
fi \
%{nil}
+%systemd_user_post() %systemd_post --user --global %{?*}
+
%systemd_preun() \
if [ $1 -eq 0 ] ; then \
# Package removal, not upgrade \
%systemd_preun() \
if [ $1 -eq 0 ] ; then \
# Package removal, not upgrade \
@@
-51,10
+53,19
@@
if [ $1 -eq 0 ] ; then \
fi \
%{nil}
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_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 \
%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}
fi \
%{nil}
+%systemd_user_postun_with_restart() %{nil}
+
%udev_hwdb_update() \
udevadm hwdb --update >/dev/null 2>&1 || : \
%{nil}
%udev_hwdb_update() \
udevadm hwdb --update >/dev/null 2>&1 || : \
%{nil}